Task 9.5 done
Merge pull request #56 from buren/Task_9.5

Task 9.5 done
Merge branch 'master' of github.com:buren/enduro into acceptanstest_9