CS fixes
Merge branch 'master' of github.com:Ph3nol/NotificationPusher