Task5 implemented
Merge pull request #242 from blez/task5

Task5 implemented