Simplifying Stream classes (The beginning)
Merge branch 'future' of github.com:wallix/redemption into future