Jieba3k

Merge branch 'master' into jieba3k