Add terminal-notifier-guard
Merge branch 'develop'