Merge pull request #22 from suntinghui/master

qqq
jia
Merge remote-tracking branch 'origin'
Merge pull request #30 from liaojia/master

jia