Merge branch 'master' of github.com:Wumpf/mstbasedheightmapgen