Made the StreamWrapper easily extendable
Merge pull request #233 from lyrixx/patch-1

Made the StreamWrapper easily extendable