Changes made by Jan Verhagen (verhagen.jca@gmail.com).