Task 06 and Task 07 done
Merge pull request #147 from jorge9200/master

Task 06 and Task 07 done