Fix example 5.2.
Merge pull request #205 from gnutix/fix-example-5.2

Fix example 5.2.
Merge pull request #206 from basdenooijer/master

Update develop with latest commits in master