Merge pull request #27 from kaytu-io/26-from-map-function

Merge pull request #27 from kaytu-io/26-from-map-function #24