Merge pull request #2 from danieldahan/development

Development
Merge https://github.com/danieldahan/stream-web into development