Map fixes
Merge pull request #17 from Markolie/master

Map fixes