Merge pull request #1 from softwiz/master

最新
Merge pull request #4 from softwiz/jk-yun

Merge pull request #1 from softwiz/master