Added ability to use templates for comments