Merge pull request #27 from suntinghui/master

ll
Merge pull request #39 from liaojia/master

lul