working livestream implemented.
Merge pull request #37 from nnfuller/andy

Working livestream implemented.
Merge pull request #38 from nnfuller/master

Update nathan branch