Update for several functions
Merge branch 'master' of https://github.com/KungensKompis/SimonsIOOPMht13