Merge pull request #8 from iTyran/v3

update from main Repository
提交有问题的修改
Merge pull request #149 from bruce0505/v3

提交对之前错误的修改