fixed some mistakes
Merge branch 'master' of https://github.com/zacbil/AOP477