Merge pull request #11 from suntinghui/master

dd
在
Merge pull request #17 from liaojia/master

dd