Final fixes.
Merge pull request #63 from Glloyd/Mapping

Mapping