Merge pull request #707 from CanineHQ/feature/notifier-types