去除警告错误
Merge pull request #173 from shenwq/master

去除警告错误
Merge remote-tracking branch 'upstream/master'