Merge pull request #43 from suntinghui/master

LJ
Merge pull request #64 from liaojia/master

LJ