Removed some warnings
Merge branch 'map' into develop
Indented some content correctly