kleine anpassungen
Merge branch 'workingbranch'