added support for template comments