Merge branch 'master' of github.com:yucong/conductor
improve experience