If tested
Merge branch 'master' of https://github.com/MathijsC/Glenn_Mathijs_W_project.git
Changes to types