Merge pull request #1 from OlgaRom/master

Merge pull request #1 from Informatik-13b/master
Update
Merge pull request #2 from Informatik-13b/master

Neuer Versuch