Fixed: deprecated variables usage in templates
Merge pull request #40 from Phil-Friderici/deprecated_vars

Fixed: deprecated variables access in templates