Merge pull request #1 from magicdict/master

测试列新分支到master
Merge pull request #2 from magicdict/master

从源分支合并
Merge pull request #10 from abeet/master

Merge pull request #1 from magicdict/master