fix bug
Merge branch 'master' of https://github.com/yucong/conductor