Improve template
Merge pull request #438 from Gama11/dev_template

Improve template