Merge pull request #30 from suntinghui/master

LJJ
Merge pull request #44 from liaojia/master

LJ