Merge pull request #7 from Pengzw/master

Merge pull request #4 from red-s-bean/master
Merge pull request #5 from red-s-bean/master

Merge pull request #7 from Pengzw/master