Revisions to reflect the discussion at issue 11
Merge pull request #13 from KenjiBaheux/rev-1-for-issue-11

Revisions to reflect the discussion at issue 11