Changes made by Roman Steck (roman.steck@netcase.ch).