Merge branch 'master' into analyzer
Added a function for merging the two streams. Has some error
Merge branch 'analyzer'