Tom Hofman

I'm looking into this as we speak, @pdaddyo has some reworks coming up so I'll focus on a small seperate part that should easily fit in.

I've corrected the documentation in #406