Fixed maploader. No more hardcoded values. Less code too!
Merge branch 'MapLoaderFix' into develop