Merge pull request #55 from rbrueckner93/Nils_VersuchterMerge

merge sth. from Nils