a few bugs change
Merge branch 'master' of https://github.com/bluedragon1/ProjectStudy into bluedragon1-master