Merge pull request #15 from Johnmalc/master

Update
Fertig!
Merge pull request #24 from AnastasiaStudent/master

out of nowhere