Fix misc errors with E_NOTIFY on
Merge branch 'master' of github.com:StudentRND/s5Api