qqqqq
Merge pull request #1 from xiawenqi/master

qqqqq