diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java
index da67bb75785..a2463c8a10b 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java
@@ -60,7 +60,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
         "byte[]",
         "List",
         "Dictionary",
-        "DateTime",
+        "DateTime?",
         "String",
         "Boolean",
         "Double",
@@ -80,9 +80,11 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
     typeMapping.put("long", "long?");
     typeMapping.put("double", "double?");
     typeMapping.put("number", "double?");
-    typeMapping.put("Date", "DateTime");
+    typeMapping.put("datetime", "DateTime?");
+    typeMapping.put("date", "DateTime?");
     typeMapping.put("file", "string"); // path to file
     typeMapping.put("array", "List");
+    typeMapping.put("list", "List");
     typeMapping.put("map", "Dictionary");
     typeMapping.put("object", "Object");
 
@@ -166,8 +168,8 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
   public String getSwaggerType(Property p) {
     String swaggerType = super.getSwaggerType(p);
     String type = null;
-    if(typeMapping.containsKey(swaggerType)) {
-      type = typeMapping.get(swaggerType);
+    if(typeMapping.containsKey(swaggerType.toLowerCase())) {
+      type = typeMapping.get(swaggerType.toLowerCase());
       if(languageSpecificPrimitives.contains(type))
         return type;
     }
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs
index cf773a7a150..a387133dfff 100644
--- a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs
@@ -25,7 +25,7 @@ namespace IO.Swagger.Model {
     
     
     [DataMember(Name="shipDate", EmitDefaultValue=false)]
-    public DateTime ShipDate { get; set; }
+    public DateTime? ShipDate { get; set; }
 
     
     /* Order Status */