Updates
Merge branch 'master' of github.com:clowdtree/conductor