Adds support for single and multiline comments #2