Definitive version (final details not taken care of)
Merge branch 'master' of https://github.com/JelleBosmans/PenO_CWA1