Merge pull request #10 from suntinghui/master

llll
ww
Merge pull request #16 from liaojia/master

ww