notifications stuff
Merge pull request #2 from jmk412/master

all