Merge pull request #42 from suntinghui/master

dd
Merge pull request #58 from liaojia/master

ee