should check to see if events are passed directly
Merge pull request #16 from jeremyBass/master

should check to see if events are passed directly