replaced all template vars with the real locations
Merge pull request #100 from Pomax/b880721

replaced all template vars with the real locations