Fixed the map focussing bug
XMerge branch 'master' of https://github.com/heidi-ann/zygote