Added exercise 1.5 and 1.6