notification edits
Merge pull request #195 from apatel/master

notification edits