template edits
Merge pull request #1 from hypatia/master

template edits