[FEATURE] merged latest develop into stream branch
Merge pull request #21 from weese/feature/stream/merge-develop

[FEATURE] merged latest develop into stream branch