close #2
Merge branch 'master' of github.com:clarity-project/cacofony