commit1
Merge branch 'xinqiang.wang' of https://github.com/wangxinqiang/text into xinqiang.wang