Fixes #839 Comments interfering with multiline support

Fixes #839

Also included second test file for regression 790. Currently the second testcase only passed because the file started with the comment, not because the comma was in a comment.