Fixes #4. Fix some formatting, comments, and wording.
Merge branch 'hotfix/v1.0.1'