Task 6

i think i've already removed other commits
Merge pull request #138 from kainruben/master

Task 6