fix the mapping merge code which was half baked
Merge pull request #8 from nherment/master

fix the mapping merge code which was half baked