Merge pull request #21 from simonpasquier/rationalize-notification-configuration

Rationalize notification configuration