Jhbate/notification

@nicolashery if you could check this out please