Add stream type support
Merge pull request #22 from wesj/master

Mozilla bug 809558 - Add stream type support