fixed a few bugs
Merge pull request #20 from gsperka/map

fixed a few bugs