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

Merge pull request #1 from red-s-bean/master
Merge pull request #6 from Pengzw/master

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