Code

Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming