Merge pull request #42 from liaojia/master

pushJ
Merge pull request #29 from suntinghui/master

：LJ