diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
index 79659d841f5..2a5d9957fd1 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
@@ -85,6 +85,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                         "Int32",
                         "Int64",
                         "Float",
+                        "Guid",
                         "Stream", // not really a primitive, we include it to avoid model import
                         "Object")
         );
@@ -110,6 +111,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         typeMapping.put("list", "List");
         typeMapping.put("map", "Dictionary");
         typeMapping.put("object", "Object");
+        typeMapping.put("uuid", "Guid");
     }
 
     public void setReturnICollection(boolean returnICollection) {
diff --git a/samples/client/petstore/ruby/press_anykey_to_continue.sh b/samples/client/petstore/ruby/press_anykey_to_continue.sh
new file mode 100644
index 00000000000..8976ca65367
--- /dev/null
+++ b/samples/client/petstore/ruby/press_anykey_to_continue.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# a script to simply wait for X seconds before contining the CI tests
+# the delay can help prevent 2 CI tests running at the same time as 
+# all CI tests use the same petstore server for testing.
+
+TIMEOUT=$(( ( RANDOM % 60 )  + 1 ))
+
+read -p 'Press any key to continue or wait for $TIMEOUT seconds' -t $TIMEOUT