Restore mungemapping patch
Fix whitespace/indentation
Merge pull request #95 from tml/mungemap

Mungemap