map work
Merge pull request #11 from plankatron/master

map work