Bug fix and changed zoom level to show ship outline
Merge branch '3.1'