Fixed templates
Merge pull request #38 from sylvaindeloux/master

Fixed templates