Move eventsource to PR
Merge pull request #831 from astorije/patch-1

Move eventsource to PR