Merge pull request #11 from Sempay/task-9

Task 9
i hope its last
Merge branch 'master' into task-9