code merge Gunnar en Jaimy

0.1
Revert "code merge Gunnar en Jaimy"

This reverts commit 10d0b14e3fd6f424c23f90b95d745f891449b661.