Merge pull request #2 from tobiasschulz/master

merge
Merge pull request #2 from Maximilian-Reuter/master

Merge pull request #2 from tobiasschulz/master