fixed exercise 4
Merge branch 'master' into fixingExercise4