Changed map options
Merge branch 'develop-simpler' into gh-pages