Map - First Stage
Merge branch 'master' of https://github.com/aquintiliano/tatu