Tweaked challenge
Merge branch 'exercise_11_setup' into exercise_11_challenge_solution