Refactering na iteratie 2
Merge commit '574e9812167f6bf8bd02df8a0ce3b1dfb28ae9c2'