Merge pull request #49 from liaojia/master

LJ
Merge pull request #35 from suntinghui/master

LJ