Update versie 1.5 by F.M.C. Timmer