Merge pull request #112 from jerome-benoit/fix-template