Issue7

This is my solution to issue #7.  Awaiting at least one review before merging.