Improved solutions to exercses 1.1, 1.2, and 1.3, see #436
Merge pull request #459 from andrejbauer/master

Improved solutions to exercses 1.1, 1.2, and 1.3, see #436