Merge pull request #38 from Arthur26/sprint2

Sprint2