bug fix
Merge remote-tracking branch 'origin/huan-v4'