Merge pull request #48 from suntinghui/master

LJ
Merge pull request #70 from liaojia/master

LJ