Merge pull request #32 from suntinghui/master

LJ
Merge pull request #47 from liaojia/master

pull