Improvement into templates, now uses variables
Merge pull request #2 from agustinhenze/master

Pull from ahenze: Improvement into templates, now uses variables