diff --git a/README.md b/README.md
index d12d676a..7ee07a84 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)
 
-*v1.0 build 30 (master branch)*
+*v1.0 build 31 (master branch)*
 
 Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)
 
diff --git a/include/catch.hpp b/include/catch.hpp
index cb8a19c1..91d392b0 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -19,6 +19,9 @@
 
 #ifdef CATCH_CONFIG_MAIN
 #  define CATCH_CONFIG_RUNNER
+#endif
+
+#ifdef CATCH_CONFIG_RUNNER
 #  ifndef CLARA_CONFIG_MAIN
 #    define CLARA_CONFIG_MAIN_NOT_DEFINED
 #    define CLARA_CONFIG_MAIN
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index 85181d64..98833ec2 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 30, "master" );
+    Version libraryVersion( 1, 0, 31, "master" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 20b25027..f0942ceb 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  CATCH v1.0 build 30 (master branch)
- *  Generated: 2014-03-07 06:56:50.010459
+ *  CATCH v1.0 build 31 (master branch)
+ *  Generated: 2014-03-10 18:01:22.986492
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -23,6 +23,9 @@
 
 #ifdef CATCH_CONFIG_MAIN
 #  define CATCH_CONFIG_RUNNER
+#endif
+
+#ifdef CATCH_CONFIG_RUNNER
 #  ifndef CLARA_CONFIG_MAIN
 #    define CLARA_CONFIG_MAIN_NOT_DEFINED
 #    define CLARA_CONFIG_MAIN
@@ -6588,7 +6591,7 @@ namespace Catch {
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 1, 0, 30, "master" );
+    Version libraryVersion( 1, 0, 31, "master" );
 }
 
 // #included from: catch_message.hpp