Proposed changes to rswanson's PR #7 

PR includes namespacing changes, typo fixes, and small code changes