Klasse Medium angepasst, User bearbeitet
Merge origin/master
Merge origin/master