refitted as a PlainTerrain object
Merge branch 'master' into gh-pages

* master:
  refitted as a PlainTerrain object