#37 (Notification Improvements) - condense dups
Merge pull request #662 from mart0258/patch-3

#37 (Notification Improvements) - condense dups