Merge7,8

This branch contains all updates from PR 7 and PR 8, some modifications to make them work well together, and some fixes for certain streams-example modules to work again.