Fix for when map isn't set, uses first one created. Closes #277
Merge remote-tracking branch 'origin/develop' into develop