Merge pull request #48 from buren/Task9_1

Task9 1
Merge branch 'master' of github.com:buren/enduro into Task9_1