Merge pull request #1316 from jpereira/debug/map