Merge pull request #679 from jialinsun/master

fix bug
fix bug
Merge branch 'master' of https://github.com/dianping/cat