Merge pull request #195 from yrodiere/no-notification-if-empty

Merge pull request #195 from yrodiere/no-notification-if-empty #410