Merge pull request #55 from suntinghui/master

lj
Merge pull request #75 from liaojia/master

Merge pull request #55 from suntinghui/master