Fixes #25 [ci skip]
Merge remote-tracking branch 'origin/master' into notifications
two notifications if two type different