Merges the maps.
Merge pull request #48 from Glloyd/master

Merges the Maps