Adjusted grammar to allow comments and no more XML parse result