New conference version
Merge branch 'master' of github.com:sundance30203/dubmix