Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
Merge pull request !135 from geruishi/master
