Map Changes
Merge pull request #108 from Sudyx/master

Map Changes
Merge remote-tracking branch 'upstream/master'