Merge pull request #33 from suntinghui/master

bug修改
Merge pull request #43 from liaojia/master

pull