Merge pull request #37 from suntinghui/master

ll
Merge pull request #52 from liaojia/master

ww