bug fixes
Merge branch 'default' of https://github.com/cbretton/SINF2255 into default