Merge pull request #1 from AndyBarnett/master

ex5 (from An-D.B. hohoho)