Merge pull request #36 from projectcs13/develop

Merge Develop
Delete unnecesary files
Change private attribute
Changes for demo
Fix edition of stream
Merge pull request #37 from projectcs13/master

Merge last hotchanges for the demo