commit by wuyj
Merge branch 'master' of https://github.com/FreeYourMind/tongxunlu