merged Dever's work in
Merge branch 'master' of https://github.com/glek/SYSC4806