Map load fix
minimal adjustments
Merge branch 'master' of https://github.com/Lusito/GameDevWeek