Fix to Issue #82

Fixed the null error in the Map class
Merge branch 'master' of https://github.com/UnofficialSpaceHulkTeam/UnofficialSpaceHulk