Merge pull request !3 from 灰太狼最美/master
修复bug #II2A5
Merge pull request !2 from mikey.zhaopeng/master