Merge pull request #39 from suntinghui/master

Lj
Merge pull request #55 from liaojia/master

LJ