Merge pull request #4 from sandro-pedrett/dev2

Dev2
Merge pull request #5 from sandro-pedrett/dev2

Dev2
Merge pull request #6 from sandro-pedrett/dev

finale abgabe