+fixed
Merge branch 'splotch' of github.com:egaburov/bonsaiRender into splotch