notification edits
Merge pull request #197 from apatel/master

notification edits