Resolves STREAMS-141

https://github.com/apache/incubator-streams/pull/59 for reference