fixed hotfix-hyf
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from houyafeng/master

hotfix-hyf