Add custom mapping support
Merge pull request #5 from mutewinter/custom_mapping

Add custom mapping support