Homework - 3
Merge pull request #149 from jorkataf/master

Homework - 3