An updated version of the mungemap proposal from @loufranco

Upstream issue/PR #6