diff --git a/Runtime/TechTalk.SpecFlow.csproj b/Runtime/TechTalk.SpecFlow.csproj
index 407282aaa..570627960 100644
--- a/Runtime/TechTalk.SpecFlow.csproj
+++ b/Runtime/TechTalk.SpecFlow.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Tracing\DefaultListener.cs" />
     <Compile Include="ErrorHandling\ErrorProvider.cs" />
     <Compile Include="Tracing\LanguageHelper.cs" />
+    <Compile Include="Tracing\NullListener.cs" />
     <Compile Include="Tracing\StepDefinitonSkeletonProvider.cs" />
     <Compile Include="Tracing\StepFormatter.cs" />
     <Compile Include="UnitTestProvider\XUnitRuntimeProvider.cs" />
diff --git a/Runtime/Tracing/NullListener.cs b/Runtime/Tracing/NullListener.cs
new file mode 100644
index 000000000..2ab3033fc
--- /dev/null
+++ b/Runtime/Tracing/NullListener.cs
@@ -0,0 +1,15 @@
+namespace TechTalk.SpecFlow.Tracing
+{
+    public class NullListener : ITraceListener
+    {
+        public void WriteTestOutput(string message)
+        {
+            //nop;
+        }
+
+        public void WriteToolOutput(string message)
+        {
+            //nop;
+        }
+    }
+}
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index c067c600d..d56cc3f9c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -15,6 +15,9 @@ New features:
 + Single installer for Visual Studio 2008 and 2010 (Issue 6, 10, 11)
 + Place GeneratedCodeAttribute and 'Designer generated code' region on generated code to 
   avoid having this code parsed by code analysis. (Issue 33)
++ Configuration option to disable all output. (Issue 29)
+  Use the following config to disable output:
+  <trace listener="TechTalk.SpecFlow.Tracing.NullListener, TechTalk.SpecFlow" />
 
 Fixed issues:
 + SpecFlow Reporting doesn't work with Firefox (Issue 31)