Modified Event Stream API

Hello Brendan,

i've modified the API a bit. Could you take a look at it please and merge if you feel its good? Thanks!

Marcus