Merge develop into Master
auto-center map even if settings.zoom is not null
Merge pull request #153 from ptrourke/issue/149/autocenter-map

Issue/149/autocenter map