Map merge attempt three.
Merge pull request #4 from Markolie/mapmerge

Map merge attempt three.