Rewrote the logic of notification
Merge branch 'hotfix/notification'

* hotfix/notification:
  Rewrote the logic of notification
Merge pull request #32 from mkhoeini/master

Rewrite of notification