Merge branch 'develop'
Working on streaming output
Merge branch 'master' into develop