Merge branch 'feature/setup' into develop
Merge branch 'develop' of github.com:clooth/coven into develop