Added streams support
Fix for lint errors
Merge pull request #2 from nfroidure/master

Added streams support