added a new constructor in case shiva is not "mounted" at root
added new constructor in case shiva is not "mounted" at root
removed stream_uri obj, added support for files
use @inheritDoc tag for javadoc
fixed formatting
Merge remote-tracking branch 'origin/master' into ci-build