Add support for mapping functions
Merge pull request #61 from pedrokiefer/mapping

Add support for mapping functions