Fix small bugs
Merge branch 'master' of github.com:11791-01/project-team01