Fixes #140.
Merge pull request #141 from frmwrk123/fix/comments

Fixes #140.