Merge pull request #10 from suntinghui/master

jia pull
Merge pull request #16 from liaojia/master

jia