Merge pull request #1 from silenceYou/master

合并原作者更新
最后更新

dadasda
Merge pull request #2 from choxin/master

最后一次测试