updated
Lastest - Map build
Merge pull request #1 from ashish-khanna/master

pull from the upstream