Merge pull request #6 from suntinghui/master

yyf
Merge pull request #10 from liaojia/master

Merge pull request #6 from suntinghui/master