Merge pull request #1 from IBMStreams/master

sync-up changes from main stream