Revert "Merge branch 'master' of https://github.com/knarfbouman/PVB.git"

This reverts commit 6684a0df0e4fce0bac64619ba90c8dcfaea29ebf.