fix for custom events

Signed-off-by: Jason Kuster <unexpectedapocalypse@gmail.com>
Merge branch 'master' of github.com:jasonkuster/scheduler into develop