ex16-3 and ex17-1
Merge pull request #2 from trevorstedman/master

ex16-3 and ex17-1