fix
Merge branch 'master' of github.com:liwei78/chaxun