another edit
Merge branch 'master' of github.com:RobertABT/heightmap