Merge branch 'hotfix/0.1' into develop
Drop docs around git-flow
Merge branch 'develop'