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 9de427058a1..afba07c9566 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
@@ -46,6 +46,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
     supportingFiles.add(new SupportingFile("apiException.mustache", 
       (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.cs"));
     supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll"));
+    supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll"));
     supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
 
     languageSpecificPrimitives = new HashSet<String>(
@@ -59,7 +60,7 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
         "byte[]",
         "List",
         "Dictionary",
-        "DateTime",
+        "DateTime?",
         "String",
         "Boolean",
         "Double",
@@ -79,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");
 
@@ -94,11 +97,11 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
 
   @Override
   public String apiFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', '/')).replace('.', File.separatorChar);
   }
 
   public String modelFileFolder() {
-    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', '/')).replace('.', File.separatorChar);
   }
 
   @Override
@@ -165,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/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll b/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll
new file mode 100644
index 00000000000..c1da1b588cd
Binary files /dev/null and b/modules/swagger-codegen/src/main/resources/csharp/RestSharp.dll differ
diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
index be16fb1636e..ed4481bb4bb 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache
@@ -1,2 +1,3 @@
 SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/{{invokerPackage}}.dll /recurse:src\*.cs /doc:bin/{{invokerPackage}}.xml
\ No newline at end of file
+%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/{{invokerPackage}}.dll /recurse:src\*.cs /doc:bin/{{invokerPackage}}.xml
+
diff --git a/samples/client/petstore/csharp/bin/RestSharp.dll b/samples/client/petstore/csharp/bin/RestSharp.dll
new file mode 100644
index 00000000000..c1da1b588cd
Binary files /dev/null and b/samples/client/petstore/csharp/bin/RestSharp.dll differ
diff --git a/samples/client/petstore/csharp/compile.bat b/samples/client/petstore/csharp/compile.bat
index 1ced2568767..63b79e03eed 100644
--- a/samples/client/petstore/csharp/compile.bat
+++ b/samples/client/petstore/csharp/compile.bat
@@ -1,2 +1,3 @@
 SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/IO.Swagger.Client.dll /recurse:src\*.cs /doc:bin/IO.Swagger.Client.xml
\ No newline at end of file
+%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll;bin/RestSharp.dll /target:library /out:bin/IO.Swagger.Client.dll /recurse:src\*.cs /doc:bin/IO.Swagger.Client.xml
+
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 */