Fixed small error in main.py where world_map was not properly identified
Attempting to merge master and develop
Fixed issue with merging branches