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

Merges the Maps