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

Fixed: deprecated variables access in templates