rewrite map
Merge pull request #1 from grsmv/master

rewrite map