Add single and multi-line comment support