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