Fixed bugs.
Merge branch 'master' of https://github.com/Mengda/hw5-team15