merged pull request from mattab:map-tweaks