petrChange
Merge pull request #1 from Puteg/newTemplatesGen

petrChange