Changes made by Davy de Jong (davy_de_jong@hotmail.com).