Merge pull request #3 from ndavis10/master

update from stream