Added commit from de ruijter