Fixed bugs
Merge pull request #30 from j4kobbech/fix-double-notifications

Fixed bugs