Map Fixes
Merge pull request #91 from alex-gh/map_fixes

Map Fixes