Changed regex on line 73 to reflect optionality of comment section