Modular map loading and new map
Merge remote-tracking branch 'origin/master'