Changes made by Matthias Tallarek (matthias.tallarek@digital-spirit.de).