trying to apply various changes from fork
Merge branch 'master' of https://github.com/flyingfisch/beech-v35