I need iostream in these files
Merge branch 'master' into speed-testing