avoid river
Merge branch 'master' of https://github.com/SketchTurner/3dcity