Map cleaning
Merge branch 'master' of https://github.com/debflav/mars