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

fix bug