Merge pull request #2 from IBMStreams/master

Merge pull request #5 from ddebrunner/master
Merge pull request #25 from ddebrunner/master

Merge pull request #2 from IBMStreams/master