Task 5
Merge pull request #8 from mapthegod/task5

Task 5