Merge pull request #40 from suntinghui/master

ww
Merge pull request #56 from liaojia/master

ll