Final edits for Issue #2

This closes all changes propsed for Issue #2.  Create pull request and
update documentation.