Merge pull request #8 from cloudwhite/master

cloud
Test by john3333