Added solutions for exercise 7