added new branching, various
Merge branch 'master' of https://github.com/dlobser/nature