Added support for comments and strings.