修复了部分bug
Merge remote-tracking branch 'remotes/michael/master'
Merge pull request #80 from LuckyDukang/master

修复bug