Small fixes for the pipes talk
Merge pull request #3 from klao/pipes-fixes

Small fixes for the pipes talk