fix bug
Merge branch 'master' of icecreamchocolates:Qing0602/NaNa