Switch to callback api from stream api
Fix conflict
Pass linting
Merge pull request #48 from wilsonpage/master

Switch to callback API from stream API