Added support for multi-line comments