fix bug
Merge branch 'master' of github.com:Hao8816/mobile