@ all variables and some empty character removal
Missed two variables
Merge pull request #72 from mrchilds/template_variable

@ all variables to avoid deprecation warnings