added map. Still need some changes with position
clean up
Merge pull request #7 from utek/map

Map