Merge pull request #6 from wzhen22/master

45456
qqqq
Merge pull request #1 from ldkris/master

dseasads