Heterogenous files processing fixed.
Merge branch 'experiments'