Map merge attempt two.
Merge pull request #3 from Markolie/mapmerge

Map merge attempt two.