Merge pull request #26 from suntinghui/master

s
kk
Merge pull request #37 from liaojia/master

kl