Map related changes
Merge pull request #4 from jayprakashj/master

Map related changes