Fix #3 added ability to switch between maps