Merge pull request #34 from suntinghui/master

pull
Merge pull request #44 from liaojia/master

pull