Geomap tweeks
Merge remote-tracking branch 'upstream/master'
Merge pull request #30 from thriuin/master

Code for zooming - not essential