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

bug修改