Merge pull request #3 from ndavis10/master

update from stream
Merge pull request #14 from Barterdm04/master

Merge pull request #3 from ndavis10/master