hofix #25
Merge branch 'development-latest' of github.com:binarygeometry/2tall-dev into development-latest