Feature/my new branch

This should be reviewed by @DWvanGeest