Merge pull request #407 from youyong205/master

fix bug
Merge pull request #408 from youyong205/master

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