Merge pull request #7 from suntinghui/master

ss
Merge pull request #11 from liaojia/master

ww