Merge pull request #13 from Pengzw/master

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