Merge pull request #8 from suntinghui/master

ll
Merge pull request #14 from liaojia/master

kk