wip
Merge pull request #218 from arv/template-element-extract-in-wrapper

Extract template content in the wrapper