Merge pull request #45 from SCPR/design_template

Closes issue 41
Merge branch 'design_template'