Merge pull request #97 from n-lopez/master

Procedure that I have followed
Merge pull request #98 from n-lopez/master

Procedure that I have followed
Task04 fixed