Merge branch 'master' of https://github.com/nytlabs/streamtools
Merge branch 'master' of https://github.com/nytlabs/streamtools
Merge branch 'master' of https://github.com/nytlabs/streamtools
Merge branch 'master' of https://github.com/nytlabs/streamtools
Merge branch 'master' of https://github.com/nytlabs/streamtools
fix for fromfile
Merge pull request #475 from nikhan/fromFileFix

From file fix