Fixes #355
Merge branch 'issue355' of https://github.com/olaf-k/ariatemplates into issue355