added stuff
Merge branch 'master' of https://github.com/stream-org/stream