Changes made by Daniel Koll (kolli92@t-online.de).