refactor code
Merge branch 'master' of github.com:dianping/cat
modify the test
Merge pull request #338 from youyong205/master

refactor