Added comment
Added support for template property