STH
Merge remote-tracking branch 'origin'
STH
STH
Merge pull request #38 from liaojia/master

pull
Merge pull request #30 from suntinghui/master

jj