Make comment detection better (fixes #62)