Finished 16.
Merge pull request #20 from JohnTrevor/master

Finished 16.