Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).