Merge branch 'hotfix/1.0.2-fix-template-render'
Fix bug with self closing tags
Fix bug with self closing tags
Merge branch 'hotfix/1.0.3-self-closing-tags' into develop