ex5
Merge pull request #30 from bzfoltho/master

ex5