Fix Mapping

See #1
Merge pull request #2 from cbourgois/patch-1

Fix Mapping