Updated parser

Fixed comments at the end of lines.
Fixed white space matching.