Merge pull request #25 from suntinghui/master

附件
Merge pull request #33 from liaojia/master

附件