Merge pull request #20 from suntinghui/master

yu
d
Merge pull request #31 from liaojia/master

d