Added support for comments in the parser