Some bug fixes
Forgot file
Merge branch 'master' of https://github.com/truly-auto/SENG403