Merge pull request #1 from XQSoftware/wangganggang

Wangganggang
Merge pull request #2 from XQSoftware/master

123