Merge pull request #30 from Arthur26/sprint2

Sprint2