Add: Support for EndOfLineComment.
Bug: A minor fix for a method that is not even used yet.
Merge remote-tracking branch 'origin/master'