Merge pull request #10 from plankatron/master

map work