Template Integration
Merge pull request #1 from KevinMarete/master

Template Integration