null point issue
Merge branch 'master' of https://github.com/blacklabel/custom_events