Merge pull request #2 from nossrf/master

Reopen stream, error reporing and minor fixes