Output intercepts
Merge pull request #49 from stepthom/Issue-40

Issue 40