Merge pull request #5 from SCPR/design_template

Design template merges