Bug fix: Incorrect parsing of comments  (Issue #541)