Merge pull request #33 from liaojia/master

附件
Merge pull request #34 from liaojia/master

LJaaa
Merge pull request #26 from suntinghui/master

附件