Merge pull request #48 from suntinghui/master

dd
kk
Merge pull request #65 from liaojia/master

uu