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