Added the possibility to use a notification handler
Fix typo in comment