Tweak bootstrap process. Closes #166.
Merge branch 'master' into init-map