Merge pull request #13 from suntinghui/master

ee
图片
Merge pull request #20 from liaojia/master

jia