Merge pull request #53 from Jannik-S/master

etc