Lazy stream creation, OriginalSourcePath added to streams. Fixes #15.