qiaolin commit
Merge branch 'master' of https://github.com/it-yang/text_git