#362 fix timeout bug
Merge pull request #542 from ndomar/c5_MohamedShaban_#45_notification_bugFix

C5 mohamed shaban #45 notification bug fix