Merge pull request #1 from erahm/master

Merge branch 'comments'
Merge pull request #2 from erahm/comments

Merge pull request #1 from erahm/master