Updates
Merge pull request #65 from Glloyd/Mapping

Mapping