Added MATTHIJS to Makefiles and config files