Changes made by Johann Klemmack (johann.klemmack@gmail.com).