Consolidated callbacks into one parameter
Merge branch 'master' of https://github.com/PeterJensen/eventstreamer