Replaced variables for template
Merge branch 'Template'