Working on the map
Merge pull request #4 from rsarwas/master

Working on the map