removed stream_uri obj, added support for files
use @inheritDoc tag for javadoc
fixed formatting