Merge pull request #26 from suntinghui/master

附件
Merge pull request #35 from liaojia/master

附件