merged in selected code from new template
Merge pull request #7 from JackDougherty/master

merged in selected code from new template