Merge pull request #2 from red-s-bean/master

呃呃
Merge pull request #5 from Pengzw/master

Merge pull request #2 from red-s-bean/master