Merge pull request #36 from benjamn/trailing-comments

Better handle trailing comments