Merge branch 'feature/3'
Merge branch 'master' of github.com:zeroDivisible/windbag