Nick Parsons Merge pull request #2 from GetStream/demo-fix