Merge pull request #36 from suntinghui/master

LJ
Merge pull request #51 from liaojia/master

LJ