forgot to add one piece of code
Merge branch 'master' of https://github.com/liuandy/CS123-Project