Updates master branch to vlakken

Vlakken can be removed