Excercise 1
Merge branch 'ex1'