Merge pull request #27 from liaojia/master

jia
Merge pull request #28 from liaojia/master

自适应
STH
Merge remote-tracking branch 'origin'
Merge pull request #21 from suntinghui/master

te