Merge pull request #42 from suntinghui/master

LJ
Merge pull request #63 from liaojia/master

LJ