Bugfix
Merge pull request #24 from Arthur26/sprint2

Bugfix