Integrated the Map
Merge pull request #5 from Megabyte355/branch-map-integration

Integrated the Map