New notification system
Merge pull request #49 from MrLesion/development

New notification system