Merge pull request #39 from tanwh/master

几个bug