Adjusted general templates
Merge pull request #123 from CTcue/generalTemplates

Adjusted general templates