template & notices update & bugfix
Merge pull request #67 from MargaretLangley/master

template & notices update & bugfix