Now handles #-beginning comments