Merge pull request #55 from oleksiyk/master

Avoid streaming when callbacks are in use
simplify a little
1.2.6