Merge pull request #8 from dianping/develop

Develop
bug fix
Merge branch 'master' of https://github.com/sunryuan/Taurus-1
bug fix
Merge pull request #73 from sunryuan/master

merge and fix bugs