Copy changes
Merge branch 'master' of github.com:andrewhao/chorus