Merge pull request #30 from chuyu123/master

1020 提交整合
joe 1021测试前小补充
merge joe 1021测试前小补充
new pull
1022测试前调整
mg joe 1022测试前修改
Merge pull request #4 from piercalex/master

merge joe 1021测试前小补充