template corrections
Merge pull request #1 from Pickra/master

template corrections