Adding some stuff %)
Merge pull request #1 from DeTeam/sprint-review-20

Adding some stuff %)