Merge notification code changes from upstream
Merge pull request #17 from nikwen/notificationColor

Merge notification code changes from upstream