merge changes from mandacht3