Improved Handler
Merge branch 'master' of https://github.com/fenos/Notifynder