buggy-version+bugfix
Merge branch 'master' of github.com:coinvent/coinvent