Fixes #249
Merge pull request #251 from pigulla/comments

Fixes #249
Merge remote-tracking branch 'upstream/master'