long tags in templates
Merge pull request #31 from nikcub/master

Use long-style tags in templates.