Changes made by Andre Schneider (andre.schneider@coloratur.com).