Merge pull request #39 from suntinghui/master

kk
Merge pull request #55 from liaojia/master

ee