Refactored interface.
Merge branch 'dev' of github.com:lukejohnosmahi/eventstreamr into dev