Merge branch 'redesign_2' of https://github.com/nikhan/streamtools into redesign
Merge branch 'redesign' of github.com:mikedewar/streamtools into redesign