Map can be zoomed in closer
Merge branch 'master' into game