map working
Merge pull request #45 from Bfinity/master

map working