Add support for combined templates
Merge pull request #54 from ragulka/combined-templates

Add support for combined templates