map fix
Merge pull request #42 from JSchulhof/new_bug_fixes

map fix