Including comments from Ian Mitchell
Merge pull request #142 from gvwilson/mitchell-comments-best-practices

Including comments from Ian Mitchell