Merge pull request #14 from buren/Task_3.4

Task 3.4
Merge branch 'master' of github.com:buren/enduro into Task_3.4