Task 7

task 7.3 still pending
Merge pull request #139 from kainruben/master

Task 7