Updated templates to use correct format for variables instead of deprecated one
Merge pull request #2 from pulyaevsky/master

Updated templates to use correct format for variables instead of deprecated one