Merge pull request #55 from rbrueckner93/Nils_VersuchterMerge

merge sth. from Nils
Merge pull request #56 from rbrueckner93/Ruben21058

Merge pull request #55 from rbrueckner93/Nils_VersuchterMerge