Partly, 16
Merge pull request #17 from JohnTrevor/master

Partly, 16