latest changes
Merge pull request #2 from jayprakashj/master

latest changes and fixes of map