eventnotify changes closes #226