Merge pull request #53 from suntinghui/master

LJ
Merge pull request #72 from liaojia/master

pull