Map generator contract additions
Merge branch 'master' of https://github.com/mosstest/mosstest.git