bug repair
Merge branch 'master' of github.com:edwardair/newProject