Merge pull request #47 from suntinghui/master

LJ
Merge pull request #68 from liaojia/master

LJ