fixed error caused by bogus refactoring
Merge branch 'unstable' into HEAD

* unstable:
  zoom map as requested in #207