Fix bugs
Merge branch 'master' of https://github.com/imdreamrunner/CZ2002Project