Changed Notification to using the eventBus
Merge pull request #442 from Junkern/issue#399

Changed Notification to using the eventBus