Merge pull request #16 from variousauthors/refactor_mapdata

Refactor mapdata
Merge branch 'master' into stop_wall_creep