Merge pull request #9 from 11693-01/master

kanghuang pull
Merge pull request #42 from yanyankangkang/master

Merge pull request #9 from 11693-01/master