Added new map loading (v0.1.5.a1)