Restored comments again
Merge pull request #36 from conclarke/master

Restored comments again