implemented task 15.1 and 15.2
Merge branch 'master' of github.com:buren/enduro into task_15
implemented tastk 15.1 and 15.2
Merge branch 'master' of github.com:buren/enduro into task_15
Merge pull request #97 from buren/task_15

Task 15