fix errors
Merge branch 'master' of https://github.com/dayiwei/Team-Blue-Card