Updated master branch to vlakken

Vlakken can be removed (2)