Do not always capture stdout - only when we need it
Merge pull request #278 from johanlindquist/master

Do not always capture stdout - only when we need it