fixed broken map
merge conflict
Merge pull request #7 from malconis/master

fixed map