Initial commit for the map
Merge branch 'map'