Issue 19

This is mostly a test, for me, of branch and pull request