Merge pull request #1 from IBMStreams/master

sync-up changes from main stream
Merge pull request #48 from chanskw/master

Merge pull request #1 from IBMStreams/master