Added in templates from pull request