diff --git a/README.md b/README.md
index ec3c7e67a44..0687abed1ee 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ The Swagger Specification has undergone 3 revisions since initial creation in 20
 
 Swagger Codegen Version | Release Date | Swagger Spec compatibility | Notes
 ----------------------- | ------------ | -------------------------- | -----
-2.1.3-M1-SNAPSHOT                | 2015-02-23   | 1.0, 1.1, 1.2, 2.0   | [tag v2.1.0-M1](https://github.com/swagger-api/swagger-codegen)
+2.1.1-M2-SNAPSHOT                | 2015-04-06   | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
 2.0.17                  | 2014-08-22   | 1.1, 1.2      | [tag v2.0.17](https://github.com/swagger-api/swagger-codegen/tree/v2.0.17)
 1.0.4                   | 2012-04-12   | 1.0, 1.1      | [tag v1.0.4](https://github.com/swagger-api/swagger-codegen/tree/swagger-codegen_2.9.1-1.1)
 
@@ -52,23 +52,41 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -o samples/client/petstore/java
 ```
 
-With a number of options.  You can get the options with the -h flag:
+With a number of options.  You can get the options with the `help generate` command:
+
 ```
-usage: Codegen
- -a,--auth                 addes authorization headers when fetching the
-                           swagger definitions remotely. Pass in a
-                           URL-encoded string of name:header with a comma
-                           separating multiple values
- -d,--debug-info           prints additional info for debugging
- -h,--help                 shows this message
- -i,--input-spec <arg>     location of the swagger spec, as URL or file
- -l,--lang <arg>           client language to generate.
-                           Available languages include:
-                           [android, async-scala, java, jaxrs, nodejs,
-                           objc, scalatra, scala, dynamic-html, html,
-                           swagger, tizen, php, ruby, python]
- -o,--output <arg>         where to write the generated files
- -t,--template-dir <arg>   folder containing the template files
+NAME
+        swagger generate - Generate code with chosen lang
+
+SYNOPSIS
+        swagger generate [(-a <authorization> | --auth <authorization>)]
+                (-i <spec file> | --input-spec <spec file>)
+                (-l <language> | --lang <language>)
+                [(-o <output directory> | --output <output directory>)]
+                [(-t <template directory> | --template-dir <template directory>)]
+                [(-v | --verbose)]
+
+OPTIONS
+        -a <authorization>, --auth <authorization>
+            adds authorization headers when fetching the swagger definitions
+            remotely. Pass in a URL-encoded string of name:header with a comma
+            separating multiple values
+
+        -i <spec file>, --input-spec <spec file>
+            location of the swagger spec, as URL or file (required)
+
+        -l <language>, --lang <language>
+            client language to generate (maybe class name in classpath,
+            required)
+
+        -o <output directory>, --output <output directory>
+            where to write the generated files (current dir by default)
+
+        -t <template directory>, --template-dir <template directory>
+            folder containing the template files
+
+        -v, --verbose
+            verbose mode
  ```
 
 You can then compile and run the client, as well as unit tests against it:
@@ -91,18 +109,17 @@ It's just as easy--just use the `-i` flag to point to either a server or file.
 ### Modifying the client library format
 Don't like the default swagger client syntax?  Want a different language supported?  No problem!  Swagger codegen processes mustache templates with the [jmustache](https://github.com/samskivert/jmustache) engine.  You can modify our templates or make your own.
 
-You can look at `modules/swagger-codegen/src/main/resources/${your-language}` for examples.  To make your own templates, create your own files and use the `-t` flag to specify your tempalte folder.  It actually is that easy.
+You can look at `modules/swagger-codegen/src/main/resources/${your-language}` for examples.  To make your own templates, create your own files and use the `-t` flag to specify your template folder.  It actually is that easy.
 
 ### Making your own codegen modules
 If you're starting a project with a new language and don't see what you need, swagger-codegen can help you create a project to generate your own libraries:
 
 ```
-java -cp modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
-  com.wordnik.swagger.codegen.MetaGenerator \
+java -jar modules/swagger-codegen-distribution/target/swagger-codegen-cli.jar meta \
   -o output/myLibrary -n myClientCodegen -p com.my.company.codegen
 ```
 
-This will write, in the folder `output/myLibrary`, all the files you need to get started, including a README.md.  Once modified and compiled, you can load your library with the codegen and generate clients with your own, custom-rolled logic.
+This will write, in the folder `output/myLibrary`, all the files you need to get started, including a README.md. Once modified and compiled, you can load your library with the codegen and generate clients with your own, custom-rolled logic.
 
 ### Where is Javascript???
 See our [javascript library](http://github.com/swagger-api/swagger-js)--it's completely dynamic and doesn't require
@@ -127,17 +144,22 @@ There are different aspects of customizing the code generator beyond just creati
 ```
 $ ls -1 modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/
 AndroidClientCodegen.java
+AsyncScalaClientCodegen.java
+CSharpClientCodegen.java
 JavaClientCodegen.java
 JaxRSServerCodegen.java
 NodeJSServerCodegen.java
 ObjcClientCodegen.java
 PhpClientCodegen.java
 PythonClientCodegen.java
+RubyClientCodegen.java
 ScalaClientCodegen.java
 ScalatraServerCodegen.java
+SpringMVCServerCodegen.java
 StaticDocCodegen.java
 StaticHtmlGenerator.java
 SwaggerGenerator.java
+SwaggerYamlGenerator.java
 TizenClientCodegen.java
 ```
 
@@ -227,6 +249,14 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
   -o samples/server/petstore/jaxrs
 ```
 
+### java spring-mvc
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l spring-mvc \
+  -o samples/server/petstore/spring-mvc
+```
 ### To build the codegen library
 
 This will create the swagger-codegen library from source.  
diff --git a/bin/all-petstore.sh b/bin/all-petstore.sh
index af3da09a8cd..e1c09b90142 100755
--- a/bin/all-petstore.sh
+++ b/bin/all-petstore.sh
@@ -19,13 +19,15 @@ fi
 
 cd $APP_DIR
 ./bin/android-java-petstore.sh
+./bin/csharp-petstore.sh
 ./bin/dynamic-html.sh
-./bin/html.sh
+./bin/html-petstore.sh
 ./bin/jaxrs-petstore-server.sh
-./bin/java-petstore-filemap.sh
 ./bin/java-petstore.sh
 ./bin/php-petstore.sh
 ./bin/python-petstore.sh
+./bin/ruby-petstore.sh
 ./bin/objc-petstore.sh
 ./bin/scala-petstore.sh
+./bin/spring-mvc-petstore-server.sh
 ./bin/tizen-petstore.sh
diff --git a/bin/android-java-petstore.sh b/bin/android-java-petstore.sh
index 2f228bc29a7..29b43103dab 100755
--- a/bin/android-java-petstore.sh
+++ b/bin/android-java-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l android -o samples/client/petstore/android-java"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/android-java -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l android -o samples/client/petstore/android-java"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/csharp-petstore.sh b/bin/csharp-petstore.sh
new file mode 100755
index 00000000000..a72a6cf84f0
--- /dev/null
+++ b/bin/csharp-petstore.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l csharp -o samples/client/petstore/csharp"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/jaxrs-petstore-server.sh b/bin/jaxrs-petstore-server.sh
index 1154fffbd1c..2dd4fc03b38 100755
--- a/bin/jaxrs-petstore-server.sh
+++ b/bin/jaxrs-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/objc-petstore.sh b/bin/objc-petstore.sh
index feefc99a28c..513b7535786 100755
--- a/bin/objc-petstore.sh
+++ b/bin/objc-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
 
 java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags
diff --git a/bin/php-petstore.sh b/bin/php-petstore.sh
index f4efe06f51b..14b53d65b4f 100755
--- a/bin/php-petstore.sh
+++ b/bin/php-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l php -o samples/client/petstore/php"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/php -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l php -o samples/client/petstore/php"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/python-petstore.sh b/bin/python-petstore.sh
index 148733fdf14..022629a9e20 100755
--- a/bin/python-petstore.sh
+++ b/bin/python-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python -o samples/client/petstore/python"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/python -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python -o samples/client/petstore/python"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/python3-petstore.sh b/bin/python3-petstore.sh
new file mode 100755
index 00000000000..e2da9783095
--- /dev/null
+++ b/bin/python3-petstore.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/python3 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python3 -o samples/client/petstore/python3"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/ruby-petstore.sh b/bin/ruby-petstore.sh
index 2d17f6cb82c..971cc154fb9 100755
--- a/bin/ruby-petstore.sh
+++ b/bin/ruby-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l ruby -o samples/client/petstore/ruby"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l ruby -o samples/client/petstore/ruby"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/scala-async-petstore.sh b/bin/scala-async-petstore.sh
index 4198e1ec3f8..1576cff65c5 100755
--- a/bin/scala-async-petstore.sh
+++ b/bin/scala-async-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l async-scala -o samples/client/petstore/async-scala"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/asyncscala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l async-scala -o samples/client/petstore/async-scala"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/scala-petstore.sh b/bin/scala-petstore.sh
index 5ed773acf16..390ca172395 100755
--- a/bin/scala-petstore.sh
+++ b/bin/scala-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scala -o samples/client/petstore/scala"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scala -o samples/client/petstore/scala"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/scalatra-petstore-server.sh b/bin/scalatra-petstore-server.sh
index 2095ced8057..433f0bcbc0f 100755
--- a/bin/scalatra-petstore-server.sh
+++ b/bin/scalatra-petstore-server.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scalatra -o samples/server/petstore/scalatra"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scalatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scalatra -o samples/server/petstore/scalatra"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-mvc-petstore-server.sh b/bin/spring-mvc-petstore-server.sh
new file mode 100755
index 00000000000..55eaa7f32e8
--- /dev/null
+++ b/bin/spring-mvc-petstore-server.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringMVC -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l spring-mvc -o samples/server/petstore/spring-mvc"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/tizen-petstore.sh b/bin/tizen-petstore.sh
index 42b531103d2..59497adc071 100755
--- a/bin/tizen-petstore.sh
+++ b/bin/tizen-petstore.sh
@@ -26,6 +26,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l tizen -o samples/client/petstore/tizen"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/tizen -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l tizen -o samples/client/petstore/tizen"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
index f17c48deee7..388dd1a8392 100644
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.wordnik</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.3-M1-SNAPSHOT</version>
+        <version>2.1.1-M2-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -15,6 +15,14 @@
 
     <build>
         <finalName>swagger-codegen-cli</finalName>
+        <resources>
+          <resource>
+            <directory>src/main/resources</directory>
+            <excludes>
+              <exclude>logback.xml</exclude>
+            </excludes>
+          </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/Readme.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/Readme.java
deleted file mode 100644
index b5ce3c7d299..00000000000
--- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/Readme.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-public class Readme {
-  public String getInfo() {
-    return "See the documentation for swagger-codegen";
-  }
-}
\ No newline at end of file
diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java
index 61bb55c54b0..c8c718fb67b 100644
--- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java
+++ b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java
@@ -10,6 +10,11 @@ import io.airlift.airline.Help;
  * User: lanwen
  * Date: 24.03.15
  * Time: 17:56
+ *
+ * Command line interface for swagger codegen
+ * use `swagger-codegen-cli.jar help` for more info
+ *
+ * @since 2.1.3-M1
  */
 public class SwaggerCodegen {
 
diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java
index 94523867bbe..0e88a947b47 100644
--- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java
+++ b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java
@@ -31,28 +31,28 @@ public class Generate implements Runnable {
     public static final String TEMPLATE_DIR_PARAM = "templateDir";
 
     @Option(name = {"-v", "--verbose"}, description = "verbose mode")
-    public boolean verbose;
+    private boolean verbose;
 
     @Option(name = {"-l", "--lang"}, title = "language", required = true,
             description = "client language to generate (maybe class name in classpath, required)")
-    public String lang;
+    private String lang;
 
     @Option(name = {"-o", "--output"}, title = "output directory",
             description = "where to write the generated files (current dir by default)")
-    public String output = "";
+    private String output = "";
 
     @Option(name = {"-i", "--input-spec"}, title = "spec file", required = true,
             description = "location of the swagger spec, as URL or file (required)")
-    public String spec;
+    private String spec;
 
     @Option(name = {"-t", "--template-dir"}, title = "template directory",
             description = "folder containing the template files")
-    public String templateDir;
+    private String templateDir;
 
     @Option(name = {"-a", "--auth"}, title = "authorization",
             description = "adds authorization headers when fetching the swagger definitions remotely. " +
                     "Pass in a URL-encoded string of name:header with a comma separating multiple values")
-    public String auth;
+    private String auth;
 
     @Override
     public void run() {
diff --git a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java
index 5f070c43bfd..47843de39ad 100644
--- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java
+++ b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java
@@ -33,22 +33,22 @@ import static com.google.common.base.Joiner.on;
         "specify, and includes default templates to include.")
 public class Meta implements Runnable {
 
-    public static final Logger LOG = LoggerFactory.getLogger(Meta.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Meta.class);
 
-    public static final String TEMPLATE_DIR_CLASSPATH = "codegen";
-    public static final String MUSTACHE_EXTENSION = ".mustache";
+    private static final String TEMPLATE_DIR_CLASSPATH = "codegen";
+    private static final String MUSTACHE_EXTENSION = ".mustache";
 
     @Option(name = {"-o", "--output"}, title = "output directory",
             description = "where to write the generated files (current dir by default)")
-    public String outputFolder = "";
+    private String outputFolder = "";
 
     @Option(name = {"-n", "--name"}, title = "name",
             description = "the human-readable name of the generator")
-    public String name = "default";
+    private String name = "default";
 
     @Option(name = {"-p", "--package"}, title = "package",
             description = "the package to put the main class into (defaults to com.wordnik.swagger.codegen)")
-    public String targetPackage = "com.wordnik.swagger.codegen";
+    private String targetPackage = "com.wordnik.swagger.codegen";
 
     @Override
     public void run() {
diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
index 1abd2689b5a..6acdf5e29f8 100644
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-codegen-project</artifactId>
-    <version>2.1.3-M1-SNAPSHOT</version>
+    <version>2.1.1-M2-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -10,10 +10,18 @@
   <artifactId>swagger-codegen</artifactId>
   <packaging>jar</packaging>
   <name>swagger-codegen (core library)</name>
-  <version>2.1.3-M1-SNAPSHOT</version>
+  <version>2.1.1-M2-SNAPSHOT</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <defaultGoal>install</defaultGoal>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>logback.xml</exclude>
+        </excludes>
+      </resource>
+    </resources>
     <extensions>
       <extension>
         <groupId>org.jvnet.wagon-svn</groupId>
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java
index 082039fc1f4..efda171ff82 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java
@@ -12,6 +12,11 @@ import org.apache.commons.cli.*;
 import java.io.File;
 import java.util.*;
 
+/**
+ * @deprecated use instead {@link com.wordnik.swagger.codegen.DefaultGenerator}
+ * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547
+ */
+@Deprecated
 public class Codegen extends DefaultGenerator {
   static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
   static String configString;
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java
index 86ff0f16650..ca73a819fb5 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java
@@ -22,6 +22,7 @@ public interface CodegenConfig {
   String toApiVarName(String name);
   String toModelName(String name);
   String toParamName(String name);
+  String escapeText(String text);
   String escapeReservedWord(String name);
   String getTypeDeclaration(Property p);
   String getTypeDeclaration(String name);
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
index f0664a72c72..6f51374c536 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
@@ -65,7 +65,7 @@ public class DefaultCodegen {
   // override with any special text escaping logic
   public String escapeText(String input) {
     if(input != null) {
-      String output = input.replaceAll("\n", " ");
+      String output = input.replaceAll("\n", "\\\\n");
       output = output.replace("\"", "\\\"");
       return output;
     }
@@ -312,14 +312,34 @@ public class DefaultCodegen {
       return "null";
     else if(p instanceof DateTimeProperty)
       return "null";
-    else if (p instanceof DoubleProperty)
+    else if (p instanceof DoubleProperty) {
+      DoubleProperty dp = (DoubleProperty) p;
+      if(dp.getDefault() != null) {
+        return dp.getDefault().toString();
+      }
       return "null";
-    else if (p instanceof FloatProperty)
+    }
+    else if (p instanceof FloatProperty) {
+      FloatProperty dp = (FloatProperty) p;
+      if(dp.getDefault() != null) {
+        return dp.getDefault().toString();
+      }
       return "null";
-    else if (p instanceof IntegerProperty)
+    }
+    else if (p instanceof IntegerProperty) {
+      IntegerProperty dp = (IntegerProperty) p;
+      if(dp.getDefault() != null) {
+        return dp.getDefault().toString();
+      }
       return "null";
-    else if (p instanceof LongProperty)
+    }
+    else if (p instanceof LongProperty) {
+      LongProperty dp = (LongProperty) p;
+      if(dp.getDefault() != null) {
+        return dp.getDefault().toString();
+      }
       return "null";
+    }
     else if (p instanceof MapProperty) {
       MapProperty ap = (MapProperty) p;
       String inner = getSwaggerType(ap.getAdditionalProperties());
@@ -406,7 +426,7 @@ public class DefaultCodegen {
       m.name = escapeReservedWord(name);
     else
       m.name = name;
-    m.description = model.getDescription();
+    m.description = escapeText(model.getDescription());
     m.classname = toModelName(name);
     m.classVarName = toVarName(name);
     m.modelJson = Json.pretty(model);
@@ -465,7 +485,7 @@ public class DefaultCodegen {
               System.out.println("failed to process model " + name);
               throw new RuntimeException(e);
             }
-            cp.required = false;
+            cp.required = null;
             if(impl.getRequired() != null) {
               for(String req : impl.getRequired()) {
                 if(key.equals(req))
@@ -672,11 +692,11 @@ public class DefaultCodegen {
       for(String key: operation.getConsumes()) {
         Map<String, String> mediaType = new HashMap<String, String>();
         mediaType.put("mediaType", key);
-        count += 1;
         if (count < operation.getConsumes().size())
           mediaType.put("hasMore", "true");
         else
           mediaType.put("hasMore", null);
+        count += 1;
         c.add(mediaType);
       }
       op.consumes = c;
@@ -818,7 +838,8 @@ public class DefaultCodegen {
     // op.cookieParams = cookieParams;
     op.formParams = addHasMore(formParams);
     // legacy support
-    op.nickname = operationId;
+    op.nickname = op.operationId;
+
 
     if(op.allParams.size() > 0) 
       op.hasParams = true;
@@ -878,8 +899,9 @@ public class DefaultCodegen {
   public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
     CodegenParameter p = CodegenModelFactory.newInstance(CodegenModelType.PARAMETER);
     p.baseName = param.getName();
-    p.description = param.getDescription();
-    p.required = param.getRequired();
+    p.description = escapeText(param.getDescription());
+    if(param.getRequired())
+      p.required = param.getRequired();
     p.jsonSchema = Json.pretty(param);
 
     if(param instanceof SerializableParameter) {
@@ -1099,6 +1121,21 @@ public class DefaultCodegen {
       m = p.matcher(word);
     }
 
+    // case out dots
+    String[] parts = word.split("\\.");
+    StringBuilder f = new StringBuilder();
+    for(String z : parts) {
+      if(z.length() > 0)
+        f.append(Character.toUpperCase(z.charAt(0))).append(z.substring(1));
+    }
+    word = f.toString();
+
+    m = p.matcher(word);
+    while (m.find()) {
+      word = m.replaceFirst("" + Character.toUpperCase(m.group(1).charAt(0)) + m.group(1).substring(1)/*.toUpperCase()*/);
+      m = p.matcher(word);
+    }
+
     // Uppercase the class name.
     p = Pattern.compile("(\\.?)(\\w)([^\\.]*)$");
     m = p.matcher(word);
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
index cb0bc5e6523..17509973215 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
@@ -11,12 +11,20 @@ import com.wordnik.swagger.models.Path;
 import com.wordnik.swagger.models.Swagger;
 import com.wordnik.swagger.models.auth.SecuritySchemeDefinition;
 import com.wordnik.swagger.util.Json;
+
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 
 import java.io.File;
 import java.io.Reader;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -60,7 +68,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
           config.additionalProperties().put("appVersion", info.getVersion());
         }
         if (info.getDescription() != null) {
-          config.additionalProperties().put("appDescription", info.getDescription());
+          config.additionalProperties().put("appDescription",
+            config.escapeText(info.getDescription()));
         }
         if (info.getContact() != null) {
           Contact contact = info.getContact();
@@ -84,12 +93,14 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
       }
 
       StringBuilder hostBuilder = new StringBuilder();
+      String scheme;
       if (swagger.getSchemes() != null && swagger.getSchemes().size() > 0) {
-        hostBuilder.append(swagger.getSchemes().get(0).toValue());
-        hostBuilder.append("://");
+        scheme = swagger.getSchemes().get(0).toValue();
       } else {
-        hostBuilder.append("https://");
+        scheme = "https";
       }
+      hostBuilder.append(scheme);
+      hostBuilder.append("://");
       if (swagger.getHost() != null) {
         hostBuilder.append(swagger.getHost());
       } else {
@@ -146,6 +157,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
       for (String tag : paths.keySet()) {
         List<CodegenOperation> ops = paths.get(tag);
         Map<String, Object> operation = processOperations(config, tag, ops);
+
         operation.put("basePath", basePath);
         operation.put("contextPath", contextPath);
         operation.put("baseName", tag);
@@ -199,6 +211,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         bundle.put("host", swagger.getHost());
       }
       bundle.put("basePath", basePath);
+      bundle.put("scheme", scheme);
       bundle.put("contextPath", contextPath);
       bundle.put("apiInfo", apis);
       bundle.put("models", allModels);
@@ -245,10 +258,29 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
           writeToFile(outputFilename, tmpl.execute(bundle));
           files.add(new File(outputFilename));
         } else {
-          String template = readTemplate(config.templateDir() + File.separator + support.templateFile);
-          FileUtils.writeStringToFile(new File(outputFilename), template);
-          System.out.println("copying file to " + outputFilename);
-          files.add(new File(outputFilename));
+          InputStream in = null;
+
+          try {
+            in = new FileInputStream(config.templateDir() + File.separator + support.templateFile);
+          }
+          catch (Exception e) {
+            // continue
+          }
+          if(in == null) {
+            in = this.getClass().getClassLoader().getResourceAsStream(config.templateDir() + File.separator + support.templateFile);
+          }
+          File outputFile = new File(outputFilename);
+          OutputStream out = new FileOutputStream(outputFile, false);
+          if(in != null && out != null)
+            IOUtils.copy(in,out);
+          else {
+            if(in == null)
+              System.out.println("can't open " + config.templateDir() + File.separator + support.templateFile + " for input");
+            if(out == null)
+              System.out.println("can't open " + outputFile + " for output");
+          }
+
+          files.add(outputFile);
         }
       }
 
@@ -336,10 +368,24 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
     Map<String, Object> operations = new HashMap<String, Object>();
     Map<String, Object> objs = new HashMap<String, Object>();
     objs.put("classname", config.toApiName(tag));
+
+    // check for operationId uniqueness
+    Set<String> opIds = new HashSet<String>();
+    int counter = 0;
+    for(CodegenOperation op : ops) {
+      String opId = op.nickname;
+      if(opIds.contains(opId)) {
+        counter ++;
+        op.nickname += "_" + counter;
+      }
+      opIds.add(opId);
+    }
     objs.put("operation", ops);
+
     operations.put("operations", objs);
     operations.put("package", config.apiPackage());
 
+
     Set<String> allImports = new LinkedHashSet<String>();
     for (CodegenOperation op : ops) {
       allImports.addAll(op.imports);
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java
index cc88f9a8000..fc5f2d020a1 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java
@@ -16,6 +16,11 @@ import java.io.File;
 import java.io.Reader;
 import java.util.*;
 
+/**
+ * @deprecated use instead {@link com.wordnik.swagger.codegen.DefaultGenerator}
+ * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547
+ */
+@Deprecated
 public class MetaGenerator extends AbstractGenerator {
   static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
   static String configString;
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
index 3fda0a06d6c..df9e289297f 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
@@ -9,9 +9,10 @@ import java.io.File;
 public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig {
   protected String invokerPackage = "io.swagger.client";
   protected String groupId = "io.swagger";
-  protected String artifactId = "swagger-client";
+  protected String artifactId = "swagger-android-client";
   protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/java";
+  protected String projectFolder = "src/main";
+  protected String sourceFolder = projectFolder + "/java";
 
   public CodegenType getTag() {
     return CodegenType.CLIENT;
@@ -50,7 +51,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
     additionalProperties.put("artifactId", artifactId);
     additionalProperties.put("artifactVersion", artifactVersion);
 
-    supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+    supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle"));
+    supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
     supportingFiles.add(new SupportingFile("apiInvoker.mustache", 
       (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
     supportingFiles.add(new SupportingFile("httpPatch.mustache", 
@@ -162,5 +164,14 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
     return toModelName(name);
   }
 
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    return camelize(operationId, true);
+  }
+
 
 }
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java
index 19b9e0f2c76..d85fdc8f695 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java
@@ -9,7 +9,7 @@ import java.io.File;
 public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
   protected String invokerPackage = "io.swagger.client";
   protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
+  protected String artifactId = "swagger-async-scala-client";
   protected String artifactVersion = "1.0.0";
   protected String sourceFolder = "src/main/scala";
   protected String clientName = "SwaggerClient";
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
new file mode 100644
index 00000000000..969b143c5a0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java
@@ -0,0 +1,186 @@
+package com.wordnik.swagger.codegen.languages;
+
+import com.wordnik.swagger.codegen.*;
+import com.wordnik.swagger.models.properties.*;
+
+import java.util.*;
+import java.io.File;
+
+public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig {
+  protected String invokerPackage = "io.swagger.client";
+  protected String groupId = "io.swagger";
+  protected String artifactId = "swagger-csharp-client";
+  protected String artifactVersion = "1.0.0";
+  protected String sourceFolder = "src/main/csharp";
+
+  public CodegenType getTag() {
+    return CodegenType.CLIENT;
+  }
+
+  public String getName() {
+    return "csharp";
+  }
+
+  public String getHelp() {
+    return "Generates a CSharp client library.";
+  }
+
+  public CSharpClientCodegen() {
+    super();
+    outputFolder = "generated-code/csharp";
+    modelTemplateFiles.put("model.mustache", ".cs");
+    apiTemplateFiles.put("api.mustache", ".cs");
+    templateDir = "csharp";
+    apiPackage = "io.swagger.Api";
+    modelPackage = "io.swagger.Model";
+
+    reservedWords = new HashSet<String> (
+      Arrays.asList(
+        "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while")
+    );
+
+    additionalProperties.put("invokerPackage", invokerPackage);
+
+    supportingFiles.add(new SupportingFile("apiInvoker.mustache", 
+      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.cs"));
+    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("compile.mustache", "", "compile.bat"));
+
+    languageSpecificPrimitives = new HashSet<String>(
+      Arrays.asList(
+        "string",
+        "bool?",
+        "double?",
+        "int?",
+        "long?",
+        "float?",
+        "byte[]",
+        "List",
+        "Dictionary",
+        "DateTime",
+        "String",
+        "Boolean",
+        "Double",
+        "Integer",
+        "Long",
+        "Float",
+        "Object")
+      );
+    instantiationTypes.put("array", "List");
+    instantiationTypes.put("map", "Dictionary");
+
+    typeMapping = new HashMap<String, String>();
+    typeMapping.put("string", "string");
+    typeMapping.put("boolean", "bool?");
+    typeMapping.put("integer", "int?");
+    typeMapping.put("float", "float?");
+    typeMapping.put("long", "long?");
+    typeMapping.put("double", "double?");
+    typeMapping.put("number", "double?");
+    typeMapping.put("Date", "DateTime");
+    typeMapping.put("file", "byte[]");
+    typeMapping.put("array", "List");
+    typeMapping.put("map", "Dictionary");
+
+  }
+
+  @Override
+  public String escapeReservedWord(String name) {
+    return "_" + name;
+  }
+
+  @Override
+  public String apiFileFolder() {
+    return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+  }
+
+  public String modelFileFolder() {
+    return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+  }
+
+  @Override
+  public String toVarName(String name) {
+    // replace - with _ e.g. created-at => created_at
+    name = name.replaceAll("-", "_");
+
+    // if it's all uppper case, do nothing
+    if (name.matches("^[A-Z_]*$"))
+      return name;
+
+    // camelize the variable name
+    // pet_id => PetId
+    name = camelize(name);
+
+    // for reserved word or word starting with number, append _
+    if(reservedWords.contains(name) || name.matches("^\\d.*"))
+      name = escapeReservedWord(name);
+
+    return name;
+  }
+
+  @Override
+  public String toParamName(String name) {
+    // should be the same as variable name
+    return toVarName(name);
+  }
+
+  @Override
+  public String toModelName(String name) {
+    // model name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(name))
+      throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+
+    // camelize the model name
+    // phone_number => PhoneNumber
+    return camelize(name);
+  }
+
+  @Override
+  public String toModelFilename(String name) {
+    // should be the same as the model name
+    return toModelName(name);
+  }
+
+
+  @Override
+  public String getTypeDeclaration(Property p) {
+    if(p instanceof ArrayProperty) {
+      ArrayProperty ap = (ArrayProperty) p;
+      Property inner = ap.getItems();
+      return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+    }
+    else if (p instanceof MapProperty) {
+      MapProperty mp = (MapProperty) p;
+      Property inner = mp.getAdditionalProperties();
+
+      return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
+    }
+    return super.getTypeDeclaration(p);
+  }
+
+  @Override
+  public String getSwaggerType(Property p) {
+    String swaggerType = super.getSwaggerType(p);
+    String type = null;
+    if(typeMapping.containsKey(swaggerType)) {
+      type = typeMapping.get(swaggerType);
+      if(languageSpecificPrimitives.contains(type))
+        return type;
+    }
+    else
+      type = swaggerType;
+    return toModelName(type);
+  }
+
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    return camelize(operationId);
+  }
+
+}
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
index 0e6abbc8f28..39ed9dfe540 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
@@ -9,7 +9,7 @@ import java.io.File;
 public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
   protected String invokerPackage = "io.swagger.client";
   protected String groupId = "io.swagger";
-  protected String artifactId = "swagger-client";
+  protected String artifactId = "swagger-java-client";
   protected String artifactVersion = "1.0.0";
   protected String sourceFolder = "src/main/java";
 
@@ -160,4 +160,15 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
       type = swaggerType;
     return toModelName(type);
   }
+
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    return camelize(operationId, true);
+  }
+
+
 }
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java
index f4aac0e74eb..e6447b9484b 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java
@@ -12,7 +12,7 @@ import java.io.File;
 public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig {
   protected String invokerPackage = "io.swagger.api";
   protected String groupId = "io.swagger";
-  protected String artifactId = "swagger-server";
+  protected String artifactId = "swagger-jaxrs-server";
   protected String artifactVersion = "1.0.0";
   protected String sourceFolder = "src/main/java";
   protected String title = "Swagger Server";
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java
index 2e91cafa992..54fa020922f 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java
@@ -48,6 +48,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         "NSObject", 
         "NSArray",
         "NSNumber",
+        "NSDate",
         "NSDictionary",
         "NSMutableArray",
         "NSMutableDictionary")
@@ -57,6 +58,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
         "NSNumber",
         "NSString",
         "NSObject",
+        "NSDate",
         "bool")
       );
 
@@ -70,9 +72,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     typeMapping = new HashMap<String, String>();
     typeMapping.put("enum", "NSString");
-    typeMapping.put("Date", "SWGDate");
-    typeMapping.put("DateTime", "SWGDate");
-    // typeMapping.put("Date", "SWGDate");
+    typeMapping.put("Date", "NSDate");
+    typeMapping.put("DateTime", "NSDate");
     typeMapping.put("boolean", "NSNumber");
     typeMapping.put("string", "NSString");
     typeMapping.put("integer", "NSNumber");
@@ -87,13 +88,13 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     typeMapping.put("object", "NSObject");
 
     importMapping = new HashMap<String, String> ();
-    importMapping.put("Date", "SWGDate");
 
     foundationClasses = new HashSet<String> (
       Arrays.asList(
         "NSNumber",
         "NSObject",
         "NSString",
+        "NSDate",
         "NSDictionary")
       );
 
@@ -102,6 +103,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
 
     supportingFiles.add(new SupportingFile("SWGObject.h", sourceFolder, "SWGObject.h"));
     supportingFiles.add(new SupportingFile("SWGObject.m", sourceFolder, "SWGObject.m"));
+    supportingFiles.add(new SupportingFile("SWGQueryParamCollection.h", sourceFolder, "SWGQueryParamCollection.h"));
+    supportingFiles.add(new SupportingFile("SWGQueryParamCollection.m", sourceFolder, "SWGQueryParamCollection.m"));
     supportingFiles.add(new SupportingFile("SWGApiClient.h", sourceFolder, "SWGApiClient.h"));
     supportingFiles.add(new SupportingFile("SWGApiClient.m", sourceFolder, "SWGApiClient.m"));
     supportingFiles.add(new SupportingFile("SWGFile.h", sourceFolder, "SWGFile.h"));
@@ -151,11 +154,45 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
 
   @Override
   public String getTypeDeclaration(Property p) {
-    String swaggerType = getSwaggerType(p);
-    if(languageSpecificPrimitives.contains(swaggerType) && !foundationClasses.contains(swaggerType))
-      return toModelName(swaggerType);
-    else
-      return swaggerType + "*";
+      if (p instanceof ArrayProperty) {
+          ArrayProperty ap = (ArrayProperty) p;
+          Property inner = ap.getItems();
+          String innerType = getSwaggerType(inner);
+
+          // In this codition, type of property p is array of primitive,
+          // return container type with pointer, e.g. `NSArray*'
+          if (languageSpecificPrimitives.contains(innerType))
+              return getSwaggerType(p) + "*";
+
+          // In this codition, type of property p is array of model,
+          // return container type combine inner type with pointer, e.g. `NSArray<SWGTag>*'
+          String innerTypeDeclaration = getTypeDeclaration(inner);
+        
+          if (innerTypeDeclaration.endsWith("*"))
+              innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
+        
+          return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*";
+      }
+      else {
+          String swaggerType = getSwaggerType(p);
+
+          // In this codition, type of p is objective-c primitive type, e.g. `NSSNumber',
+          // return type of p with pointer, e.g. `NSNumber*'
+          if (languageSpecificPrimitives.contains(swaggerType) &&
+              foundationClasses.contains(swaggerType)) {
+              return swaggerType + "*";
+          }
+          // In this codition, type of p is c primitive type, e.g. `bool',
+          // return type of p, e.g. `bool'
+          else if (languageSpecificPrimitives.contains(swaggerType)) {
+              return swaggerType;
+          }
+          // In this codition, type of p is objective-c object type, e.g. `SWGPet',
+          // return type of p with pointer, e.g. `'
+          else {
+              return swaggerType + "*";
+          }
+      }
   }
 
   @Override
@@ -229,8 +266,24 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
     else
       return paramName;
   }
+  
+  @Override
+  public String toParamName(String name) {
+    // should be the same as variable name
+    return toVarName(name);
+  }
 
   public String escapeReservedWord(String name) {
     return "_" + name;
   }
+
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    return camelize(operationId, true);
+  }
+
 }
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
index 2f86153bfb7..ae907423d78 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
@@ -27,7 +27,13 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
 
   public PhpClientCodegen() {
     super();
-    modelPackage = "models";
+
+    invokerPackage = camelize("SwaggerClient"); 
+
+    String packagePath = invokerPackage + "-php";
+
+    modelPackage = packagePath + "/lib/models";
+    apiPackage = packagePath + "/lib";
     outputFolder = "generated-code/php";
     modelTemplateFiles.put("model.mustache", ".php");
     apiTemplateFiles.put("api.mustache", ".php");
@@ -59,7 +65,10 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
     typeMapping.put("List", "array");
     typeMapping.put("map", "map");
 
-    supportingFiles.add(new SupportingFile("Swagger.mustache", "", "Swagger.php"));
+    supportingFiles.add(new SupportingFile("composer.mustache", packagePath, "composer.json"));
+    supportingFiles.add(new SupportingFile("APIClient.mustache", packagePath + "/lib", "APIClient.php"));
+    supportingFiles.add(new SupportingFile("APIClientException.mustache", packagePath + "/lib", "APIClientException.php"));
+    supportingFiles.add(new SupportingFile("require.mustache", packagePath, invokerPackage + ".php"));
   }
 
   @Override
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java
new file mode 100755
index 00000000000..81ba21ebe72
--- /dev/null
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/Python3ClientCodegen.java
@@ -0,0 +1,198 @@
+package com.wordnik.swagger.codegen.languages;
+
+import com.wordnik.swagger.codegen.*;
+import com.wordnik.swagger.models.properties.*;
+
+import java.io.File;
+import java.util.*;
+
+public class Python3ClientCodegen extends DefaultCodegen implements CodegenConfig {
+  String module = "client";
+
+  public CodegenType getTag() {
+    return CodegenType.CLIENT;
+  }
+
+  public String getName() {
+    return "python3";
+  }
+
+  public String getHelp() {
+    return "Generates a Python3 client library.";
+  }
+
+  public Python3ClientCodegen() {
+    super();
+    outputFolder = "generated-code/python3";
+    modelTemplateFiles.put("model.mustache", ".py");
+    apiTemplateFiles.put("api.mustache", ".py");
+    templateDir = "python3";
+
+    apiPackage = module;
+    modelPackage = module + ".models";
+
+    languageSpecificPrimitives.clear();
+    languageSpecificPrimitives.add("int");
+    languageSpecificPrimitives.add("float");
+    //languageSpecificPrimitives.add("long");
+    languageSpecificPrimitives.add("list");
+    languageSpecificPrimitives.add("bool");
+    languageSpecificPrimitives.add("str");
+    languageSpecificPrimitives.add("datetime");
+
+    typeMapping.clear();
+    typeMapping.put("integer", "int");
+    typeMapping.put("float", "float");
+    typeMapping.put("long", "int");
+    typeMapping.put("double", "float");
+    typeMapping.put("array", "list");
+    typeMapping.put("map", "map");
+    typeMapping.put("boolean", "bool");
+    typeMapping.put("string", "str");
+    typeMapping.put("date", "datetime");
+
+    // from https://docs.python.org/release/2.5.4/ref/keywords.html
+    reservedWords = new HashSet<String> (
+      Arrays.asList(
+        "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
+        "assert", "else", "if", "pass", "yield", "break", "except", "import",
+        "print", "class", "exec", "in", "raise", "continue", "finally", "is",
+        "return", "def", "for", "lambda", "try"));
+
+    //supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+    supportingFiles.add(new SupportingFile("swagger.mustache", module, "swagger.py"));
+    supportingFiles.add(new SupportingFile("__init__.mustache", module, "__init__.py"));
+  }
+
+  @Override
+  public String escapeReservedWord(String name) {
+    return "_" + name;
+  }
+
+  @Override
+  public String apiFileFolder() {
+    return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
+  }
+
+  public String modelFileFolder() {
+    return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
+  }
+
+  @Override
+  public String getTypeDeclaration(Property p) {
+    if(p instanceof ArrayProperty) {
+      ArrayProperty ap = (ArrayProperty) p;
+      Property inner = ap.getItems();
+      return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+    }
+    else if (p instanceof MapProperty) {
+      MapProperty mp = (MapProperty) p;
+      Property inner = mp.getAdditionalProperties();
+
+      return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")";
+    }
+    return super.getTypeDeclaration(p);
+  }
+
+  @Override
+  public String getSwaggerType(Property p) {
+    String swaggerType = super.getSwaggerType(p);
+    String type = null;
+    if(typeMapping.containsKey(swaggerType)) {
+      type = typeMapping.get(swaggerType);
+      if(languageSpecificPrimitives.contains(type)) {
+        return type;
+      }
+    }
+    else
+      type = swaggerType;
+    return type;
+  }
+
+  public String toDefaultValue(Property p) {
+	// TODO: Support Python def value
+    return "null";
+  }
+
+  @Override
+  public String toVarName(String name) {
+    // replace - with _ e.g. created-at => created_at
+    name = name.replaceAll("-", "_");
+
+    // if it's all uppper case, convert to lower case
+    if (name.matches("^[A-Z_]*$"))
+      name = name.toLowerCase();
+
+    // camelize (lower first character) the variable name
+    // petId => pet_id
+    name = underscore(name);
+
+    // for reserved word or word starting with number, append _
+    if(reservedWords.contains(name) || name.matches("^\\d.*"))
+      name = escapeReservedWord(name);
+
+    return name;
+  }
+
+  @Override
+  public String toParamName(String name) {
+    // should be the same as variable name
+    return toVarName(name);
+  }
+
+  @Override
+  public String toModelName(String name) {
+    // model name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(name))
+      throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+
+    // camelize the model name
+    // phone_number => PhoneNumber
+    return camelize(name);
+  }
+
+  @Override
+  public String toModelFilename(String name) {
+    // model name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(name))
+      throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+
+    // underscore the model file name
+    // PhoneNumber.rb => phone_number.rb
+    return underscore(name);
+  }
+
+  @Override
+  public String toApiFilename(String name) {
+    // replace - with _ e.g. created-at => created_at
+    name = name.replaceAll("-", "_");
+
+    // e.g. PhoneNumberApi.rb => phone_number_api.rb
+    return underscore(name) + "_api";
+  }
+
+  @Override
+  public String toApiName(String name) {
+    if(name.length() == 0)
+      return "DefaultApi";
+    // e.g. phone_number_api => PhoneNumberApi
+    return camelize(name) + "Api";
+  }
+
+  @Override
+  public String toApiVarName(String name) {
+      if(name.length() == 0)
+          return "default_api";
+    return underscore(name) + "_api";
+  }
+
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    return underscore(operationId);
+  }
+
+}
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java
index 962f5ac0848..bbb07b1592a 100755
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java
@@ -4,9 +4,12 @@ import com.wordnik.swagger.codegen.*;
 import com.wordnik.swagger.models.properties.*;
 
 import java.io.File;
+import java.util.*;
 
 public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig {
-  String module = "client";
+  protected String module = "SwaggerPetstore";
+  protected String invokerPackage;
+  protected String eggPackage;
 
   public CodegenType getTag() {
     return CodegenType.CLIENT;
@@ -22,14 +25,18 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
 
   public PythonClientCodegen() {
     super();
+
+    eggPackage = module + "-python";
+    invokerPackage = eggPackage + "/" + module;
+
     outputFolder = "generated-code/python";
     modelTemplateFiles.put("model.mustache", ".py");
     apiTemplateFiles.put("api.mustache", ".py");
     templateDir = "python";
-    
-    apiPackage = module;
-    modelPackage = module + ".models";
-    
+
+    apiPackage = invokerPackage;
+    modelPackage = invokerPackage + ".models";
+
     languageSpecificPrimitives.clear();
     languageSpecificPrimitives.add("int");
     languageSpecificPrimitives.add("float");
@@ -50,11 +57,21 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
     typeMapping.put("string", "str");
     typeMapping.put("date", "datetime");
 
-    
-    supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-    supportingFiles.add(new SupportingFile("swagger.mustache", module, "swagger.py"));
-    supportingFiles.add(new SupportingFile("__init__.mustache", module, "__init__.py"));
-    supportingFiles.add(new SupportingFile("__init__.mustache", modelPackage.replace('.', File.separatorChar), "__init__.py"));
+    // from https://docs.python.org/release/2.5.4/ref/keywords.html
+    reservedWords = new HashSet<String> (
+      Arrays.asList(
+        "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
+        "assert", "else", "if", "pass", "yield", "break", "except", "import",
+        "print", "class", "exec", "in", "raise", "continue", "finally", "is",
+        "return", "def", "for", "lambda", "try"));
+
+    additionalProperties.put("module", module);
+
+    supportingFiles.add(new SupportingFile("README.mustache", eggPackage, "README.md"));
+    supportingFiles.add(new SupportingFile("setup.mustache", eggPackage, "setup.py"));
+    supportingFiles.add(new SupportingFile("swagger.mustache", invokerPackage, "swagger.py"));
+    supportingFiles.add(new SupportingFile("__init__package.mustache", invokerPackage, "__init__.py"));
+    supportingFiles.add(new SupportingFile("__init__model.mustache", modelPackage.replace('.', File.separatorChar), "__init__.py"));
   }
 
   @Override
@@ -105,5 +122,87 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
   public String toDefaultValue(Property p) {
 	// TODO: Support Python def value
     return "null";
-  }	
+  }
+
+  @Override
+  public String toVarName(String name) {
+    // replace - with _ e.g. created-at => created_at
+    name = name.replaceAll("-", "_");
+
+    // if it's all uppper case, convert to lower case
+    if (name.matches("^[A-Z_]*$"))
+      name = name.toLowerCase();
+
+    // camelize (lower first character) the variable name
+    // petId => pet_id
+    name = underscore(name);
+
+    // for reserved word or word starting with number, append _
+    if(reservedWords.contains(name) || name.matches("^\\d.*"))
+      name = escapeReservedWord(name);
+
+    return name;
+  }
+
+  @Override
+  public String toParamName(String name) {
+    // should be the same as variable name
+    return toVarName(name);
+  }
+
+  @Override
+  public String toModelName(String name) {
+    // model name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(name))
+      throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+
+    // camelize the model name
+    // phone_number => PhoneNumber
+    return camelize(name);
+  }
+
+  @Override
+  public String toModelFilename(String name) {
+    // model name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(name))
+      throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+
+    // underscore the model file name
+    // PhoneNumber.rb => phone_number.rb
+    return underscore(name);
+  }
+
+  @Override
+  public String toApiFilename(String name) {
+    // replace - with _ e.g. created-at => created_at
+    name = name.replaceAll("-", "_");
+
+    // e.g. PhoneNumberApi.rb => phone_number_api.rb
+    return underscore(name) + "_api";
+  }
+
+  @Override
+  public String toApiName(String name) {
+    if(name.length() == 0)
+      return "DefaultApi";
+    // e.g. phone_number_api => PhoneNumberApi
+    return camelize(name) + "Api";
+  }
+
+  @Override
+  public String toApiVarName(String name) {
+      if(name.length() == 0)
+          return "default_api";
+    return underscore(name) + "_api";
+  }
+
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    return underscore(operationId);
+  }
+
 }
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java
index f2f0f00df87..0c472a2b75d 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java
@@ -64,6 +64,8 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
     typeMapping.put("List", "array");
     typeMapping.put("map", "map");
 
+    supportingFiles.add(new SupportingFile("swagger-client.gemspec.mustache", "", "swagger-client.gemspec"));
+    supportingFiles.add(new SupportingFile("swagger-client.mustache", "", "lib/swagger-client.rb"));
     supportingFiles.add(new SupportingFile("swagger.mustache", "", "lib/swagger.rb"));
     supportingFiles.add(new SupportingFile("monkey.mustache", "", "lib/monkey.rb"));
     supportingFiles.add(new SupportingFile("swagger/request.mustache", "", "lib/swagger/request.rb"));
@@ -187,4 +189,14 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
     return camelize(name) + "Api";
   }
 
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    return underscore(operationId); 
+  }
+
+
 }
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java
index ffef50b76e4..4695cc3d065 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java
@@ -9,7 +9,7 @@ import java.io.File;
 public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
   protected String invokerPackage = "io.swagger.client";
   protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
+  protected String artifactId = "swagger-scala-client";
   protected String artifactVersion = "1.0.0";
   protected String sourceFolder = "src/main/scala";
   protected String authScheme = "";
@@ -189,4 +189,15 @@ public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig
     else
       return "null";
   }
-}
\ No newline at end of file
+
+
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    return camelize(operationId, true);
+  }
+
+}
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringdoxServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java
similarity index 71%
rename from modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringdoxServerCodegen.java
rename to modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java
index dc8d2f2a3e3..252457758d8 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringdoxServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java
@@ -9,13 +9,13 @@ import com.wordnik.swagger.models.properties.*;
 import java.util.*;
 import java.io.File;
 
-public class SpringdoxServerCodegen extends JavaClientCodegen implements CodegenConfig {
-    protected String invokerPackage = "com.concur.service.api";
-    protected String groupId = "com.concur.service";
-    protected String artifactId = "swagger-server";
+public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.api";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-spring-mvc-server";
     protected String artifactVersion = "1.0.0";
     protected String sourceFolder = "src/main/java";
-    protected String title = "Concur Server";
+    protected String title = "Petstore Server";
 
     protected String configPackage = "";
 
@@ -24,22 +24,22 @@ public class SpringdoxServerCodegen extends JavaClientCodegen implements Codegen
     }
 
     public String getName() {
-        return "springdox";
+        return "spring-mvc";
     }
 
     public String getHelp() {
-        return "Generates a Java SpringDox Server application.";
+        return "Generates a Java Spring-MVC Server application using the SpringFox integration.";
     }
 
-    public SpringdoxServerCodegen() {
+    public SpringMVCServerCodegen() {
         super();
-        outputFolder = "generated-code/javaSpringdox";
+        outputFolder = "generated-code/javaSpringMVC";
         modelTemplateFiles.put("model.mustache", ".java");
         apiTemplateFiles.put("api.mustache", ".java");
-        templateDir = "JavaSpringdox";
-        apiPackage = "com.concur.service.api";
-        modelPackage = "com.concur.service.model";
-        configPackage = "com.concur.service.configuration";
+        templateDir = "JavaSpringMVC";
+        apiPackage = "io.swagger.api";
+        modelPackage = "io.swagger.model";
+        configPackage = "io.swagger.configuration";
 
 
         additionalProperties.put("invokerPackage", invokerPackage);
@@ -47,32 +47,41 @@ public class SpringdoxServerCodegen extends JavaClientCodegen implements Codegen
         additionalProperties.put("artifactId", artifactId);
         additionalProperties.put("artifactVersion", artifactVersion);
         additionalProperties.put("title", title);
+        additionalProperties.put("apiPackage", apiPackage);
+        additionalProperties.put("configPackage", configPackage);
 
         supportingFiles.clear();
         supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
-        supportingFiles.add(new SupportingFile("ApiException.mustache",
+        supportingFiles.add(new SupportingFile("apiException.mustache",
                 (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiException.java"));
-        supportingFiles.add(new SupportingFile("ApiOriginFilter.mustache",
+        supportingFiles.add(new SupportingFile("apiOriginFilter.mustache",
                 (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java"));
-        supportingFiles.add(new SupportingFile("ApiResponseMessage.mustache",
+        supportingFiles.add(new SupportingFile("apiResponseMessage.mustache",
                 (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java"));
-        supportingFiles.add(new SupportingFile("NotFoundException.mustache",
+        supportingFiles.add(new SupportingFile("notFoundException.mustache",
                 (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java"));
 
-
-        supportingFiles.add(new SupportingFile("SwaggerConfig.mustache",
+        supportingFiles.add(new SupportingFile("swaggerConfig.mustache",
                 (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "SwaggerConfig.java"));
+        supportingFiles.add(new SupportingFile("webApplication.mustache",
+                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebApplication.java"));
+        supportingFiles.add(new SupportingFile("webMvcConfiguration.mustache",
+                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebMvcConfiguration.java"));
+        supportingFiles.add(new SupportingFile("swaggerUiConfiguration.mustache",
+                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "SwaggerUiConfiguration.java"));
+        supportingFiles.add(new SupportingFile("swagger.properties",
+                ("src.main.resources").replace(".", java.io.File.separator), "swagger.properties"));
 
         languageSpecificPrimitives = new HashSet<String>(
-                Arrays.asList(
-                        "String",
-                        "boolean",
-                        "Boolean",
-                        "Double",
-                        "Integer",
-                        "Long",
-                        "Float")
+          Arrays.asList(
+            "String",
+            "boolean",
+            "Boolean",
+            "Double",
+            "Integer",
+            "Long",
+            "Float")
         );
     }
 
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java
index d5ebe81c16e..7186f24a0e0 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java
@@ -1,6 +1,7 @@
 package com.wordnik.swagger.codegen.languages;
 
 import com.wordnik.swagger.codegen.*;
+import com.wordnik.swagger.models.Operation;
 import com.wordnik.swagger.models.properties.*;
 import com.wordnik.swagger.util.Json;
 
@@ -8,6 +9,7 @@ import java.util.*;
 import java.io.File;
 
 public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig {
+  private static final String ALL_OPERATIONS = "";
   protected String invokerPackage = "com.wordnik.client";
   protected String groupId = "com.wordnik";
   protected String artifactId = "swagger-client";
@@ -33,12 +35,6 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig
 
     defaultIncludes = new HashSet<String>();
 
-    String partner = "our Partner";
-
-    if(System.getProperty("partner") != null)
-      partner = System.getProperty("partner");
-
-    additionalProperties.put("partner", partner);
     additionalProperties.put("appName", "Swagger Sample");
     additionalProperties.put("appDescription", "A sample swagger server");
     additionalProperties.put("infoUrl", "https://helloreverb.com");
@@ -82,4 +78,20 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig
     }
     return objs;
   }
+
+  @Override
+  public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
+    List<CodegenOperation> opList = operations.get(ALL_OPERATIONS);
+    if(opList == null) {
+      opList = new ArrayList<CodegenOperation>();
+      operations.put(ALL_OPERATIONS, opList);
+    }
+    for (CodegenOperation addedOperation: opList){
+      if (addedOperation.operationId.equals(co.operationId) && addedOperation.path.equals(co.path) && addedOperation.httpMethod.equals(co.httpMethod)) {
+        addedOperation.tags.addAll(co.tags);
+        return;
+      }
+    }
+    opList.add(co);
+  }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java
index 007a978d36b..ab9fa033f1c 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java
@@ -244,4 +244,15 @@ public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig
   public String escapeReservedWord(String name) {
     return "_" + name;
   }
+
+  @Override
+  public String toOperationId(String operationId) {
+    // method name cannot use reserved keyword, e.g. return$
+    if(reservedWords.contains(operationId))
+      throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+
+    // add_pet_by_id => addPetById
+    return camelize(operationId, true);
+  }
+
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache
index ad26268d715..a1c9e05042d 100644
--- a/modules/swagger-codegen/src/main/resources/Java/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache
@@ -11,6 +11,7 @@ import java.util.*;
 {{/imports}}
 
 import com.sun.jersey.multipart.FormDataMultiPart;
+import com.sun.jersey.multipart.file.FileDataBodyPart;
 
 import javax.ws.rs.core.MediaType;
 
@@ -36,10 +37,12 @@ public class {{classname}} {
   }
 
   {{#operation}}
-  {{#errorList}} //error info- code: {{code}} reason: "{{reason}}" model: {{#responseModel}}{{responseModel}}
-  {{/responseModel}}{{^responseModel}}<none>
-  {{/responseModel}}
-  {{/errorList}}  
+  /**
+   * {{summary}}
+   * {{notes}}
+{{#allParams}}   * @param {{paramName}} {{description}}
+{{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+   */
   public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
     Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
     {{#requiredParamCount}}
@@ -77,7 +80,8 @@ public class {{classname}} {
       mp.field("{{baseName}}", ApiInvoker.parameterToString({{paramName}}), MediaType.MULTIPART_FORM_DATA_TYPE);
       {{/notFile}}{{#isFile}}
       hasFields = true;
-      mp.field("{{baseName}}", {{paramName}}, MediaType.MULTIPART_FORM_DATA_TYPE);
+      mp.field("{{baseName}}", file.getName());
+      mp.bodyPart(new FileDataBodyPart("{{baseName}}", {{paramName}}, MediaType.MULTIPART_FORM_DATA_TYPE));
       {{/isFile}}{{/formParams}}
       if(hasFields)
         postBody = mp;
@@ -96,12 +100,7 @@ public class {{classname}} {
         return {{#returnType}}null{{/returnType}};
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return {{#returnType}} null{{/returnType}};
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   {{/operation}}
diff --git a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
index cc77f01a9a6..ac689046047 100644
--- a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
@@ -16,6 +16,7 @@ import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.MediaType;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -40,7 +41,7 @@ public class ApiInvoker {
    * ISO 8601 date time format.
    * @see https://en.wikipedia.org/wiki/ISO_8601
    */
-  public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+  public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
 
   /**
    * ISO 8601 date format.
@@ -52,6 +53,13 @@ public class ApiInvoker {
     // Use UTC as the default time zone.
     DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
     DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    // Set default User-Agent.
+    setUserAgent("Java-Swagger");
+  }
+
+  public static void setUserAgent(String userAgent) {
+    INSTANCE.addDefaultHeader("User-Agent", userAgent);
   }
 
   public static Date parseDateTime(String str) {
@@ -83,11 +91,19 @@ public class ApiInvoker {
       return "";
     } else if (param instanceof Date) {
       return formatDateTime((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
     } else {
       return String.valueOf(param);
     }
   }
-
   public void enableDebug() {
     isDebug = true;
   }
@@ -217,7 +233,7 @@ public class ApiInvoker {
     }
     else if ("DELETE".equals(method)) {
       if(body == null)
-        response = builder.delete(ClientResponse.class, serialize(body));
+        response = builder.delete(ClientResponse.class);
       else
         response = builder.type(contentType).delete(ClientResponse.class, serialize(body));
     }
@@ -228,12 +244,26 @@ public class ApiInvoker {
       return null;
     }
     else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {
-      return (String) response.getEntity(String.class);
+      if(response.hasEntity()) {
+        return (String) response.getEntity(String.class);
+      }
+      else {
+        return "";
+      }
     }
     else {
+      String message = "error";
+      if(response.hasEntity()) {
+        try{
+          message = String.valueOf(response.getEntity(String.class));
+        }
+        catch (RuntimeException e) {
+          // e.printStackTrace();
+        }
+      }
       throw new ApiException(
                 response.getClientResponseStatus().getStatusCode(),
-                response.getEntity(String.class));
+                message);
     }
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/model.mustache b/modules/swagger-codegen/src/main/resources/Java/model.mustache
index ea9f88cb48c..b6135636597 100644
--- a/modules/swagger-codegen/src/main/resources/Java/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/model.mustache
@@ -26,7 +26,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
    * minimum: {{minimum}}{{/minimum}}{{#maximum}}
    * maximum: {{maximum}}{{/maximum}}
    **/
-  @ApiModelProperty(required = {{required}}, value = "{{{description}}}")
+  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
index 73d62103e22..9f4c858a8a0 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache
@@ -157,11 +157,10 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0-M1</swagger-annotations-version>
-    <jersey-version>1.7</jersey-version>
-    <jackson-version>2.1.4</jackson-version>
+    <swagger-annotations-version>1.5.3-M1</swagger-annotations-version>
+    <jersey-version>1.18</jersey-version>
+    <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
-    <junit-version>4.8.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.8.1</junit-version>
   </properties>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/headerParams.mustache
index 0f88692ad1d..84a801e48ac 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/headerParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/headerParams.mustache
@@ -1 +1 @@
-{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
+{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
index 48da4b2c7ff..98901e392bc 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
@@ -26,7 +26,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
    * minimum: {{minimum}}{{/minimum}}{{#maximum}}
    * maximum: {{maximum}}{{/maximum}}
    **/
-  @ApiModelProperty(required = {{required}}, value = "{{{description}}}")
+  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{name}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pathParams.mustache
index 1f1b30887a4..5bb31c704f7 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pathParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pathParams.mustache
@@ -1 +1 @@
-{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
+{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
index 9ead2787b3c..d9e3b90bc95 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
@@ -26,31 +26,27 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>${jetty-version}</version>
         <configuration>
-          <webAppConfig>
-            <contextPath>{{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}</contextPath>
-          </webAppConfig>
+          <webApp>
+            <contextPath>/</contextPath>
+          </webApp>
           <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
-          <webDefaultXml>${project.basedir}/conf/jetty/webdefault.xml</webDefaultXml>
           <stopPort>8079</stopPort>
           <stopKey>stopit</stopKey>
-          <connectors>
-            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-              <port>8002</port>
-              <maxIdleTime>60000</maxIdleTime>
-              <confidentialPort>8443</confidentialPort>
-            </connector>
-          </connectors>
+          <httpConnector>
+            <port>8080</port>
+            <idleTimeout>60000</idleTimeout>
+          </httpConnector>
         </configuration>
         <executions>
           <execution>
             <id>start-jetty</id>
             <phase>pre-integration-test</phase>
             <goals>
-              <goal>run</goal>
+              <goal>start</goal>
             </goals>
             <configuration>
               <scanIntervalSeconds>0</scanIntervalSeconds>
@@ -133,8 +129,8 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.3-M1-SNAPSHOT</swagger-core-version>
-    <jetty-version>8.1.11.v20130520</jetty-version>
+    <swagger-core-version>2.1.1-M2-SNAPSHOT</swagger-core-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
     <scala-test-version>1.6.1</scala-test-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/queryParams.mustache
index b9e80e5a7e7..067493867c9 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/queryParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @QueryParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache
index f6181046dda..752615b76b7 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/web.mustache
@@ -34,7 +34,7 @@
     </init-param>
     <init-param>
       <param-name>swagger.api.basepath</param-name>
-      <param-value>http://localhost:8002</param-value>
+      <param-value>http://localhost:8080</param-value>
     </init-param>
     <load-on-startup>2</load-on-startup>
   </servlet>
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/README.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/README.mustache
new file mode 100644
index 00000000000..f357cb9a081
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/README.mustache
@@ -0,0 +1,11 @@
+# Swagger generated server
+
+Spring MVC Server
+
+
+## Overview
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub.  This is an example of building a swagger-enabled server in Java using the Spring MVC framework.
+
+The underlying library integrating swagger to Spring-MVC is [springfox](https://github.com/springfox/springfox)
+
+You can view the server in swagger-ui by pointing to http://localhost:8002{{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}/sdoc.jsp
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
new file mode 100644
index 00000000000..007a4a75ccf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache
@@ -0,0 +1,53 @@
+package {{apiPackage}};
+
+import {{modelPackage}}.*;
+
+{{#imports}}import {{import}};
+{{/imports}}
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/{{baseName}}", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/{{baseName}}", description = "the {{baseName}} API")
+{{#operations}}
+public class {{classname}} {
+  {{#operation}}
+
+  @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}})
+  @ApiResponses(value = { {{#responses}}
+    @ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} })
+  @RequestMapping(value = "{{path}}", 
+    {{#hasProduces}}produces = { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}
+    {{#hasConsumes}}consumes = { {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}
+    method = RequestMethod.{{httpMethod}})
+  public ResponseEntity<{{returnType}}> {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
+    {{/hasMore}}{{/allParams}})
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<{{returnType}}>(HttpStatus.OK);
+  }
+
+  {{/operation}}
+}
+{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/ApiException.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/ApiOriginFilter.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/ApiResponseMessage.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/bodyParams.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/bodyParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/bodyParams.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache
new file mode 100644
index 00000000000..83c928ea92e
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache
@@ -0,0 +1,2 @@
+{{#isFormParam}}{{#notFile}}
+@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@RequestPart("{{paramName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestPart("file") MultipartFile fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache
similarity index 58%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/headerParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache
index 0f88692ad1d..dd0ea1ad4ce 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/headerParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache
@@ -1 +1 @@
-{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
+{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@RequestHeader("{{paramName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/model.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
similarity index 93%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/model.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
index 48da4b2c7ff..98901e392bc 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache
@@ -26,7 +26,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
    * minimum: {{minimum}}{{/minimum}}{{#maximum}}
    * maximum: {{maximum}}{{/maximum}}
    **/
-  @ApiModelProperty(required = {{required}}, value = "{{{description}}}")
+  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{name}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/NotFoundException.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pathParams.mustache
similarity index 59%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/pathParams.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/pathParams.mustache
index 1f1b30887a4..4a6f7dfc922 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/pathParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pathParams.mustache
@@ -1 +1 @@
-{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
+{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{paramName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
similarity index 54%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/pom.mustache
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
index 9ead2787b3c..fc15f492fdf 100644
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache
@@ -26,31 +26,28 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>${jetty-version}</version>
         <configuration>
           <webAppConfig>
             <contextPath>{{^contextPath}}/{{/contextPath}}{{#contextPath}}{{contextPath}}{{/contextPath}}</contextPath>
           </webAppConfig>
-          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
+          <webAppSourceDirectory>target/${project.artifactId}-${project-version}</webAppSourceDirectory>
           <webDefaultXml>${project.basedir}/conf/jetty/webdefault.xml</webDefaultXml>
           <stopPort>8079</stopPort>
           <stopKey>stopit</stopKey>
-          <connectors>
-            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-              <port>8002</port>
-              <maxIdleTime>60000</maxIdleTime>
-              <confidentialPort>8443</confidentialPort>
-            </connector>
-          </connectors>
+          <httpConnector>
+            <port>8002</port>
+            <idleTimeout>60000</idleTimeout>
+          </httpConnector>
         </configuration>
         <executions>
           <execution>
             <id>start-jetty</id>
             <phase>pre-integration-test</phase>
             <goals>
-              <goal>run</goal>
+              <goal>start</goal>
             </goals>
             <configuration>
               <scanIntervalSeconds>0</scanIntervalSeconds>
@@ -66,6 +63,49 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>swagger-ui</id>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/${project.artifactId}-${project.version}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/swagger-ui-${swagger-ui-version}/dist</directory>
+                  <filtering>true</filtering>
+                  <excludes>
+                    <exclude>index.html</exclude>
+                  </excludes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -105,6 +145,50 @@
       <version>${jersey-version}</version>
     </dependency>
 
+    <!--Spring dependencies -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+
+    <!--SpringFox dependencies-->
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-core</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-spi</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-spring-web</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_2.9.1</artifactId>
@@ -125,20 +209,21 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>sonatype-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
+      <id>jcenter-snapshots</id>
+      <name>jcenter</name>
+      <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
     </repository>
   </repositories>
   <properties>
     <swagger-core-version>1.5.3-M1-SNAPSHOT</swagger-core-version>
-    <jetty-version>8.1.11.v20130520</jetty-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
+    <swagger-ui-version>2.1.0-M2</swagger-ui-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
     <scala-test-version>1.6.1</scala-test-version>
     <junit-version>4.8.1</junit-version>
     <servlet-api-version>2.5</servlet-api-version>
+    <springfox-version>2.0.0-SNAPSHOT</springfox-version>
+    <spring-version>4.0.9.RELEASE</spring-version>
   </properties>
 </project>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/project/build.properties b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/project/build.properties
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/project/build.properties
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/project/build.properties
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/project/plugins.sbt b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/project/plugins.sbt
similarity index 100%
rename from modules/swagger-codegen/src/main/resources/JavaSpringdox/project/plugins.sbt
rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/project/plugins.sbt
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache
new file mode 100755
index 00000000000..313289d9eaf
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache
@@ -0,0 +1 @@
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value = "{{paramName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swagger.properties b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swagger.properties
new file mode 100644
index 00000000000..fdbe5371934
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swagger.properties
@@ -0,0 +1 @@
+springfox.documentation.swagger.v2.path=/api-docs
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache
new file mode 100644
index 00000000000..b33ee7fc994
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache
@@ -0,0 +1,40 @@
+package {{configPackage}};
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.Import;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+
+@Configuration
+@ComponentScan(basePackages = "{{apiPackage}}")
+@EnableWebMvc
+@EnableSwagger2 //Loads the spring beans required by the framework
+@PropertySource("classpath:swagger.properties")
+@Import(SwaggerUiConfiguration.class)
+public class SwaggerConfig {
+    @Bean
+    ApiInfo apiInfo() {
+        ApiInfo apiInfo = new ApiInfo(
+        "{{appName}}",
+        "{{{appDescription}}}",
+        "{{appVersion}}",
+        "{{infoUrl}}",
+        "{{infoEmail}}",
+        "{{licenseInfo}}",
+        "{{licenseUrl}}" );
+        return apiInfo;
+    }
+
+    @Bean
+    public Docket customImplementation(){
+        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo());
+    }
+
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache
new file mode 100644
index 00000000000..652dc310358
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerUiConfiguration.mustache
@@ -0,0 +1,46 @@
+package {{configPackage}};
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+
+@Configuration
+@EnableWebMvc
+public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter {
+  private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" };
+
+  private static final String[] CLASSPATH_RESOURCE_LOCATIONS = {
+      "classpath:/META-INF/resources/", "classpath:/resources/",
+      "classpath:/static/", "classpath:/public/" };
+
+  private static final String[] RESOURCE_LOCATIONS;
+  static {
+    RESOURCE_LOCATIONS = new String[CLASSPATH_RESOURCE_LOCATIONS.length
+        + SERVLET_RESOURCE_LOCATIONS.length];
+    System.arraycopy(SERVLET_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS, 0,
+        SERVLET_RESOURCE_LOCATIONS.length);
+    System.arraycopy(CLASSPATH_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS,
+        SERVLET_RESOURCE_LOCATIONS.length, CLASSPATH_RESOURCE_LOCATIONS.length);
+  }
+
+  private static final String[] STATIC_INDEX_HTML_RESOURCES;
+  static {
+    STATIC_INDEX_HTML_RESOURCES = new String[RESOURCE_LOCATIONS.length];
+    for (int i = 0; i < STATIC_INDEX_HTML_RESOURCES.length; i++) {
+      STATIC_INDEX_HTML_RESOURCES[i] = RESOURCE_LOCATIONS[i] + "index.html";
+    }
+  }
+
+  @Override
+  public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    if (!registry.hasMappingForPattern("/webjars/**")) {
+      registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+    if (!registry.hasMappingForPattern("/**")) {
+      registry.addResourceHandler("/**").addResourceLocations(RESOURCE_LOCATIONS);
+    }
+  }
+
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache
new file mode 100644
index 00000000000..6910ad11b76
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache
@@ -0,0 +1,21 @@
+package {{configPackage}};
+
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
+
+public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
+
+    @Override
+    protected Class<?>[] getRootConfigClasses() {
+        return new Class[] { SwaggerConfig.class };
+    }
+
+    @Override
+    protected Class<?>[] getServletConfigClasses() {
+        return new Class<?>[] { WebMvcConfiguration.class };
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        return new String[] { "/" };
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache
new file mode 100644
index 00000000000..03904e51e79
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache
@@ -0,0 +1,11 @@
+package {{configPackage}};
+
+import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+public class WebMvcConfiguration extends WebMvcConfigurationSupport {
+    @Override
+    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+        configurer.enable();
+    }
+}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/README.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringdox/README.mustache
deleted file mode 100644
index 9a01e33edf8..00000000000
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/README.mustache
+++ /dev/null
@@ -1,12 +0,0 @@
-# Swagger generated server
-
-Springdox
-
-
-## Overview
-This server was generated by the [swagger-codegen](https://github.com/wordnik/swagger-codegen) project.  By using the 
-[swagger-spec](https://github.com/wordnik/swagger-core/wiki) from a remote server, you can easily generate a server stub.  This
-is an example of building a swagger-enabled scalatra server.
-
-This example uses the [Springdox](https://github.com/springdox/springdox) framework.
-
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/SwaggerConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringdox/SwaggerConfig.mustache
deleted file mode 100644
index 81418e4a9ef..00000000000
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/SwaggerConfig.mustache
+++ /dev/null
@@ -1,55 +0,0 @@
-package {{configPackage}};
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import springdox.documentation.swagger2.annotations.EnableSwagger2;
-import springdox.documentation.spring.web.plugins.DocumentationConfigurer;
-
-import springdox.documentation.spi.DocumentationType;
-import springdox.documentation.service.ApiInfo;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-import java.util.Set;
-
-
-@Configuration
-@EnableWebMvc
-@EnableSwagger2 //Loads the spring beans required by the framework
-public class SwaggerConfig {
-
-private DocumentationConfigurer documentationConfigurer;
-
-    @Autowired
-    public void setDocumentationConfigurer(DocumentationConfigurer configurer){
-        this.documentationConfigurer = documentationConfigurer;
-    }
-
-    @Bean
-    ApiInfo apiInfo() {
-        ApiInfo apiInfo = new ApiInfo(
-        "{{appName}}",
-        "{{appDescription}}",
-        "1.0.0",
-        "My Apps API terms of service",
-        "{{infoEmail}}",
-        "{{licenseInfo}}",
-        "{{licenseUrl}}" );
-        return apiInfo;
-    }
-
-    @Bean
-    public DocumentationConfigurer customImplementation(){
-        return new DocumentationConfigurer(DocumentationType.SWAGGER_2)
-            .groupName("default")
-            .includePatterns(".*replace {{appName}} with your api classes.*")
-            .apiInfo(apiInfo());
-    }
-
-    @Bean
-    ObjectMapper objectMapper() { return new ObjectMapper(); }
-
-}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringdox/api.mustache
deleted file mode 100644
index 7dacdbec419..00000000000
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/api.mustache
+++ /dev/null
@@ -1,49 +0,0 @@
-package {{apiPackage}};
-
-import {{modelPackage}}.*;
-
-import com.wordnik.swagger.annotations.*;
-
-import com.sun.jersey.multipart.FormDataParam;
-
-{{#imports}}import {{import}};
-{{/imports}}
-
-import java.util.List;
-import {{package}}.NotFoundException;
-
-import java.io.InputStream;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import static org.springframework.http.MediaType.*;
-
-@Controller
-@RequestMapping("/{{baseName}}",produces = {APPLICATION_JSON_VALUE})
-@Api(value = "/{{baseName}}", description = "the {{baseName}} API")
-{{#operations}}
-public class {{classname}} {
-  {{#operation}}
-
-  {{#subresourceOperation}}@RequestMapping(value = {{path}}, method = RequestMethod.{{httpMethod}} ){{/subresourceOperation}}
-  {{#hasConsumes}}@Consumes({ {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
-  {{#hasProduces}}@Produces({ {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
-  @ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}})
-  @ApiResponses(value = { {{#responses}}
-    @ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},
-    {{/hasMore}}{{/responses}} })
-
-  public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},
-    {{/hasMore}}{{/allParams}})
-      throws NotFoundException {
-      // do some magic!
-      return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
-  }
-
-  {{/operation}}
-}
-{{/operations}}
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringdox/formParams.mustache
deleted file mode 100644
index ba842165f3d..00000000000
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/formParams.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@FormParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}@ApiParam(value = "{{{description}}}") @FormDataParam("file") InputStream inputStream,
-    @ApiParam(value = "file detail") @FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringdox/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringdox/queryParams.mustache
deleted file mode 100644
index b9e80e5a7e7..00000000000
--- a/modules/swagger-codegen/src/main/resources/JavaSpringdox/queryParams.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @QueryParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig
index 8303425734d..54236bffc9c 100644
--- a/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig
+++ b/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig
@@ -1,17 +1,19 @@
 com.wordnik.swagger.codegen.languages.AndroidClientCodegen
 com.wordnik.swagger.codegen.languages.AsyncScalaClientCodegen
+com.wordnik.swagger.codegen.languages.CSharpClientCodegen
 com.wordnik.swagger.codegen.languages.JavaClientCodegen
 com.wordnik.swagger.codegen.languages.JaxRSServerCodegen
-com.wordnik.swagger.codegen.languages.SpringdoxServerCodegen
 com.wordnik.swagger.codegen.languages.NodeJSServerCodegen
 com.wordnik.swagger.codegen.languages.ObjcClientCodegen
-com.wordnik.swagger.codegen.languages.ScalatraServerCodegen
+com.wordnik.swagger.codegen.languages.PhpClientCodegen
+com.wordnik.swagger.codegen.languages.PythonClientCodegen
+com.wordnik.swagger.codegen.languages.Python3ClientCodegen
+com.wordnik.swagger.codegen.languages.RubyClientCodegen
 com.wordnik.swagger.codegen.languages.ScalaClientCodegen
+com.wordnik.swagger.codegen.languages.ScalatraServerCodegen
+com.wordnik.swagger.codegen.languages.SpringMVCServerCodegen
 com.wordnik.swagger.codegen.languages.StaticDocCodegen
 com.wordnik.swagger.codegen.languages.StaticHtmlGenerator
 com.wordnik.swagger.codegen.languages.SwaggerGenerator
 com.wordnik.swagger.codegen.languages.SwaggerYamlGenerator
 com.wordnik.swagger.codegen.languages.TizenClientCodegen
-com.wordnik.swagger.codegen.languages.PhpClientCodegen
-com.wordnik.swagger.codegen.languages.RubyClientCodegen
-com.wordnik.swagger.codegen.languages.PythonClientCodegen
diff --git a/modules/swagger-codegen/src/main/resources/android-java/api.mustache b/modules/swagger-codegen/src/main/resources/android-java/api.mustache
index 83a43b42853..0f21897e677 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/api.mustache
@@ -39,10 +39,12 @@ public class {{classname}} {
   }
 
   {{#operation}}
-  {{#errorList}} //error info- code: {{code}} reason: "{{reason}}" model: {{#responseModel}}{{responseModel}}
-  {{/responseModel}}{{^responseModel}}<none>
-  {{/responseModel}}
-  {{/errorList}}
+  /**
+   * {{summary}}
+   * {{notes}}
+{{#allParams}}   * @param {{paramName}} {{description}}
+{{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+   */
   public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
     Object postBody = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
 
@@ -105,12 +107,7 @@ public class {{classname}} {
         return {{#returnType}}null{{/returnType}};
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return {{#returnType}} null{{/returnType}};
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   {{/operation}}
diff --git a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
index 8b31abd48ab..0c0e26b5e2c 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
@@ -16,6 +16,7 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.*;
 import org.apache.http.impl.conn.*;
+import org.apache.http.impl.conn.tsccm.*;
 import org.apache.http.params.*;
 import org.apache.http.util.EntityUtils;
 
@@ -24,6 +25,7 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.net.URLEncoder;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -70,7 +72,7 @@ public class ApiInvoker {
    * ISO 8601 date time format.
    * @see https://en.wikipedia.org/wiki/ISO_8601
    */
-  public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+  public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
 
   /**
    * ISO 8601 date format.
@@ -82,6 +84,13 @@ public class ApiInvoker {
     // Use UTC as the default time zone.
     DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
     DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    // Set default User-Agent.
+    setUserAgent("Android-Java-Swagger");
+  }
+
+  public static void setUserAgent(String userAgent) {
+    INSTANCE.addDefaultHeader("User-Agent", userAgent);
   }
 
   public static Date parseDateTime(String str) {
@@ -113,6 +122,15 @@ public class ApiInvoker {
       return "";
     } else if (param instanceof Date) {
       return formatDateTime((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
     } else {
       return String.valueOf(param);
     }
@@ -140,7 +158,7 @@ public class ApiInvoker {
 
   public static Object deserialize(String json, String containerType, Class cls) throws ApiException {
     try{
-      if("List".equals(containerType)) {
+      if("list".equalsIgnoreCase(containerType) || "array".equalsIgnoreCase(containerType)) {
         JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
         List response = (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
         return response;
@@ -300,6 +318,7 @@ public class ApiInvoker {
           HttpEntity resEntity = response.getEntity();
           responseString = EntityUtils.toString(resEntity);
         }
+        return responseString;
       }
       else {
         if(response.getEntity() != null) {
@@ -308,9 +327,8 @@ public class ApiInvoker {
         }
         else
           responseString = "no data";
-        throw new ApiException(code, responseString);
       }
-      return responseString;
+      throw new ApiException(code, responseString);
     }
     catch(IOException e) {
       throw new ApiException(500, e.getMessage());
@@ -364,7 +382,7 @@ public class ApiInvoker {
       schemeRegistry.register(httpsScheme);
       schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
 
-      ignoreSSLConnectionManager = new SingleClientConnManager(new BasicHttpParams(), schemeRegistry);
+      ignoreSSLConnectionManager = new ThreadSafeClientConnManager(new BasicHttpParams(), schemeRegistry);
     } catch (NoSuchAlgorithmException e) {
       // This will only be thrown if SSL isn't available for some reason.
     } catch (KeyManagementException e) {
diff --git a/modules/swagger-codegen/src/main/resources/android-java/build.mustache b/modules/swagger-codegen/src/main/resources/android-java/build.mustache
new file mode 100644
index 00000000000..dfe5e1725d4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/android-java/build.mustache
@@ -0,0 +1,55 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.2'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion '22.0.0'
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 22
+    }
+}
+
+ext {
+    swagger_annotations_version = "1.5.3-M1"
+    jackson_version = "2.5.2"
+    httpclient_version = "4.3.3"
+    junit_version = "4.8.1"
+}
+
+dependencies {
+    compile "com.wordnik:swagger-annotations:$swagger_annotations_version"
+    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "org.apache.httpcomponents:httpcore:$httpclient_version"
+    compile "org.apache.httpcomponents:httpclient:$httpclient_version"
+    compile "org.apache.httpcomponents:httpmime:$httpclient_version"
+    testCompile "junit:junit:$junit_version"
+}
+
+afterEvaluate {
+    android.libraryVariants.all { variant ->
+        def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+        task.description = "Create jar artifact for ${variant.name}"
+        task.dependsOn variant.javaCompile
+        task.from variant.javaCompile.destinationDir
+        task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+        task.archiveName = "${project.name}-${variant.baseName}.jar"
+        artifacts.add('archives', task);
+    }
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/android-java/manifest.mustache b/modules/swagger-codegen/src/main/resources/android-java/manifest.mustache
new file mode 100644
index 00000000000..165749c3cc4
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/android-java/manifest.mustache
@@ -0,0 +1,3 @@
+<manifest package="{{invokerPackage}}">
+    <application />
+</manifest>
diff --git a/modules/swagger-codegen/src/main/resources/android-java/model.mustache b/modules/swagger-codegen/src/main/resources/android-java/model.mustache
index ea9f88cb48c..b6135636597 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/model.mustache
@@ -26,7 +26,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
    * minimum: {{minimum}}{{/minimum}}{{#maximum}}
    * maximum: {{maximum}}{{/maximum}}
    **/
-  @ApiModelProperty(required = {{required}}, value = "{{{description}}}")
+  @ApiModelProperty({{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
   @JsonProperty("{{baseName}}")
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/swagger-codegen/src/main/resources/android-java/pom.mustache b/modules/swagger-codegen/src/main/resources/android-java/pom.mustache
deleted file mode 100644
index 8a01631edb0..00000000000
--- a/modules/swagger-codegen/src/main/resources/android-java/pom.mustache
+++ /dev/null
@@ -1,168 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>{{groupId}}</groupId>
-  <artifactId>{{artifactId}}</artifactId>
-  <packaging>jar</packaging>
-  <name>{{artifactId}}</name>
-  <version>{{artifactVersion}}</version>
-  <scm>
-    <connection>scm:git:git@github.com:wordnik/swagger-mustache.git</connection>
-    <developerConnection>scm:git:git@github.com:wordnik/swagger-codegen.git</developerConnection>
-    <url>https://github.com/wordnik/swagger-codegen</url>
-  </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>loggerPath</name>
-              <value>conf/log4j.properties</value>
-            </property>
-          </systemProperties>
-          <argLine>-Xms512m -Xmx1500m</argLine>
-          <parallel>methods</parallel>
-          <forkMode>pertest</forkMode>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- attach test jar -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add_sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/main/java</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add_test_sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/test/java</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.wordnik</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>${jackson-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpclient-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>${httpclient-version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit-version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <repositories>
-    <repository>
-      <id>sonatype-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </repository>
-  </repositories>
-  <properties>
-    <swagger-annotations-version>1.5.1-M1</swagger-annotations-version>
-    <jackson-version>2.1.4</jackson-version>
-    <junit-version>4.8.1</junit-version>
-    <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
-    <httpclient-version>4.3.6</httpclient-version>
-  </properties>
-</project>
diff --git a/modules/swagger-codegen/src/main/resources/asyncscala/sbt.mustache b/modules/swagger-codegen/src/main/resources/asyncscala/sbt.mustache
index 6264f46b12e..b96e132d8a7 100644
--- a/modules/swagger-codegen/src/main/resources/asyncscala/sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/asyncscala/sbt.mustache
@@ -2,10 +2,11 @@ organization := "{{package}}"
 
 name := "{{projectName}}-client"
 
-libraryDependencies += "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5"
-
-libraryDependencies += "joda-time" % "joda-time" % "2.3"
-
-libraryDependencies += "org.joda" % "joda-convert" % "1.3.1"
-
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided"
+libraryDependencies ++= Seq(
+  "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5",
+  "joda-time" % "joda-time" % "2.3",
+  "org.joda" % "joda-convert" % "1.3.1",
+  "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided",
+  "org.scalatest" %% "scalatest" % "2.2.1" % "test",
+  "junit" % "junit" % "4.11" % "test"
+)
diff --git a/modules/swagger-codegen/src/main/resources/csharp/api.mustache b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
index 3d556fa72f8..084caf97b9b 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/api.mustache
@@ -1,101 +1,111 @@
-  using System;
-  using System.Collections.Generic;
-  using {{invokerPackage}};
-  using {{modelPackage}};
-  {{#imports}}
-  {{/imports}}
+using System;
+using System.Collections.Generic;
+using {{invokerPackage}};
+using {{modelPackage}};
+{{#imports}}
+{{/imports}}
 
-  namespace {{package}} {
-    {{#operations}}
-    public class {{classname}} {
-      string basePath;
-      private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
+namespace {{package}} {
+  {{#operations}}
+  public class {{classname}} {
+    string basePath;
+    private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
 
-      public {{classname}}(String basePath = "{{basePath}}")
-      {
-        this.basePath = basePath;
+    public {{classname}}(String basePath = "{{basePath}}")
+    {
+      this.basePath = basePath;
+    }
+
+    public ApiInvoker getInvoker() {
+      return apiInvoker;
+    }
+
+    // Sets the endpoint base url for the services being accessed
+    public void setBasePath(string basePath) {
+      this.basePath = basePath;
+    }
+
+    // Gets the endpoint base url for the services being accessed
+    public String getBasePath() {
+      return basePath;
+    }
+
+    {{#operation}}
+
+    /// <summary>
+    /// {{summary}} {{notes}}
+    /// </summary>
+    {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
+    {{#hasMore}} {{/hasMore}}{{/allParams}}
+    /// <returns></returns>
+    public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
+      // create path and map variables
+      var path = "{{path}}".Replace("{format}","json"){{#pathParams}}.Replace("{" + "{{baseName}}" + "}", apiInvoker.ParameterToString({{{paramName}}})){{/pathParams}};
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      {{#requiredParamCount}}
+      // verify required params are set
+      if ({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
+         throw new ApiException(400, "missing required params");
       }
+      {{/requiredParamCount}}
 
-      public ApiInvoker getInvoker() {
-        return apiInvoker;
+      {{#queryParams}}if ({{paramName}} != null){
+        queryParams.Add("{{baseName}}", apiInvoker.ParameterToString({{paramName}}));
       }
+      {{/queryParams}}
 
-      // Sets the endpoint base url for the services being accessed
-      public void setBasePath(string basePath) {
-        this.basePath = basePath;
-      }
+      {{#headerParams}}headerParams.Add("{{baseName}}", apiInvoker.ParameterToString({{paramName}}));
+      {{/headerParams}}
 
-      // Gets the endpoint base url for the services being accessed
-      public String getBasePath() {
-        return basePath;
-      }
-
-      {{#operation}}
-
-      /// <summary>
-      /// {{summary}} {{notes}}
-      /// </summary>
-      {{#allParams}}/// <param name="{{paramName}}">{{description}}</param>
-      {{#hasMore}} {{/hasMore}}{{/allParams}}
-      /// <returns></returns>
-      public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}} {{nickname}} ({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
-        // create path and map variables
-        var path = "{{path}}".Replace("{format}","json"){{#pathParams}}.Replace("{" + "{{paramName}}" + "}", apiInvoker.escapeString({{{paramName}}}.ToString())){{/pathParams}};
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-        var formParams = new Dictionary<String, object>();
-
-        {{#requiredParamCount}}
-        // verify required params are set
-        if ({{/requiredParamCount}}{{#requiredParams}} {{paramName}} == null {{#hasMore}}|| {{/hasMore}}{{/requiredParams}}{{#requiredParamCount}}) {
-           throw new ApiException(400, "missing required params");
+      {{#formParams}}if ({{paramName}} != null){
+        if({{paramName}} is byte[]) {
+          formParams.Add("{{baseName}}", {{paramName}});
+        } else {
+          formParams.Add("{{baseName}}", apiInvoker.ParameterToString({{paramName}}));
         }
-        {{/requiredParamCount}}
+      }
+      {{/formParams}}
 
-        {{#queryParams}}if ({{paramName}} != null){
-          string paramStr = ({{paramName}} is DateTime) ? ((DateTime)(object){{paramName}}).ToString("u") : Convert.ToString({{paramName}});
-          queryParams.Add("{{paramName}}", paramStr);
-		}
-        {{/queryParams}}
-
-        {{#headerParams}}headerParams.Add("{{paramName}}", {{paramName}});
-        {{/headerParams}}
-
-        {{#formParams}}if ({{paramName}} != null){
-          if({{paramName}} is byte[]) {
-            formParams.Add("{{paramName}}", {{paramName}});
-          } else {
-            string paramStr = ({{paramName}} is DateTime) ? ((DateTime)(object){{paramName}}).ToString("u") : Convert.ToString({{paramName}});
-            formParams.Add("{{paramName}}", paramStr);
-          }
-		}
-        {{/formParams}}
-
-        try {
-          if (typeof({{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}) == typeof(byte[])) {
-            var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
-            return {{#returnType}}((object)response) as {{{returnType}}}{{/returnType}};
-          } else {
-            var response = apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, {{#bodyParam}}{{bodyParam}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams, formParams);
-            if(response != null){
-               return {{#returnType}}({{{returnType}}}) ApiInvoker.deserialize(response, typeof({{{returnType}}})){{/returnType}};
-            }
-            else {
-              return {{#returnType}}null{{/returnType}};
-            }
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return {{#returnType}}null{{/returnType}};
+      try {
+        if (typeof({{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}) == typeof(byte[])) {
+          {{#returnType}}
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as {{{returnType}}};
+          {{/returnType}}
+          {{^returnType}}
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          {{/returnType}}
+        } else {
+          {{#returnType}}
+          var response = apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams, formParams);
+          if (response != null){
+             return ({{{returnType}}}) ApiInvoker.deserialize(response, typeof({{{returnType}}}));
           }
           else {
-            throw ex;
+            return null;
           }
+          {{/returnType}}
+          {{^returnType}}
+          apiInvoker.invokeAPI(basePath, path, "{{httpMethod}}", queryParams, {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}}, headerParams, formParams);
+          return;
+          {{/returnType}}
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return {{#returnType}}null{{/returnType}};
+        }
+        else {
+          throw ex;
         }
       }
-      {{/operation}}
     }
-    {{/operations}}
-  }
\ No newline at end of file
+    {{/operation}}
+  }
+  {{/operations}}
+}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/csharp/apiInvoker.mustache
index f7c76ee2c56..4e7f1b6997b 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/apiInvoker.mustache
@@ -15,14 +15,41 @@
         return _instance;
       }
 
+      /// <summary>
+      /// Add default header
+      /// </summary>
+      /// <param name="key">  Header field name
+      /// <param name="value"> Header field value
+      /// <returns></returns>
       public void addDefaultHeader(string key, string value) {
          defaultHeaderMap.Add(key, value);
       }
 
+      /// <summary>
+      /// escape string (url-encoded)
+      /// </summary>
+      /// <param name="str"> String to be escaped
+      /// <returns>Escaped string</returns>
       public string escapeString(string str) {
         return str;
       }
 
+      /// <summary>
+      /// if parameter is DateTime, output in ISO8601 format, otherwise just return the string
+      /// </summary>
+      /// <param name="obj"> The parameter (header, path, query, form)
+      /// <returns>Formatted string</returns>
+      public string ParameterToString(object obj)
+      {
+        return (obj is DateTime) ? ((DateTime)obj).ToString ("u") : Convert.ToString (obj);
+      }
+
+      /// <summary>
+      /// Deserialize the JSON string into a proper object
+      /// </summary>
+      /// <param name="json"> JSON string
+      /// <param name="type"> Object type
+      /// <returns>Object representation of the JSON string</returns>
       public static object deserialize(string json, Type type) {
         try
         {
@@ -99,6 +126,7 @@
               case "GET":
                   break;
               case "POST":
+              case "PATCH":
               case "PUT":
               case "DELETE":
                   using (Stream requestStream = client.GetRequestStream())
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
index dd2a573d751..3f74c63de3b 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
@@ -13,13 +13,14 @@
     <div class="license-info">{{{licenseInfo}}}</div>
     <div class="license-url">{{{licenseUrl}}}</div>
   <h2>Access</h2>
-  <div class="method-summary">Access to the API requires an api key to be provided by {{partner}} for all requests.  The api key is passed as a header with the name `api_key` and the value provided by Reverb Technologies, Inc.  Unless otherwise agreed upon, access to the Reverb API is intended solely for usage by {{partner}} and not third parties.</div>
+  <div class="method-summary">Customize this message as you see fit!</div>
   <h2>Methods</h2>
   {{#apiInfo}}
   {{#apis}}
   {{#operations}}{{#operation}}
   <div class="method">
     <div class="method-path"><pre class="{{httpMethod}}"><code class="huge"><span>{{httpMethod}}</span>: {{path}}</code></pre></div>
+    <div class="method-tags"> {{#tags}}<span class="method-tag">{{this}}</span>{{/tags}}</div>
     <div class="method-summary"><span class="nickname">{{nickname}}</span> {{summary}}</div>
     <div class="method-notes">{{notes}}</div>
 
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
index 0421bcc8c3c..14ab06a7f7e 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/style.css.mustache
@@ -54,6 +54,7 @@ hr	{
 
 pre {
   padding: 10px;
+  margin-bottom: 2px;
 }
 
 pre.get {
@@ -134,3 +135,17 @@ code {
 .param-header {
   font-weight: bold;
 }
+
+.method-tags {
+  text-align: right;
+}
+
+.method-tag {
+  background: none repeat scroll 0% 0% #24A600;
+  border-radius: 3px;
+  padding: 2px 10px;
+  margin: 2px;
+  color: #FFF;
+  display: inline-block;
+  text-decoration: none;
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/objc/Podfile.mustache b/modules/swagger-codegen/src/main/resources/objc/Podfile.mustache
index ea7deab2625..1a9d463c86a 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Podfile.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Podfile.mustache
@@ -1,3 +1,4 @@
 platform :ios, '6.0'
 xcodeproj '{{projectName}}/{{projectName}}.xcodeproj'
 pod 'AFNetworking', '~> 2.1'
+pod 'JSONModel', '~> 1.0'
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.m b/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.m
index ff454970cf0..6942a21c738 100644
--- a/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.m
+++ b/modules/swagger-codegen/src/main/resources/objc/SWGApiClient.m
@@ -1,5 +1,6 @@
 #import "SWGApiClient.h"
 #import "SWGFile.h"
+#import "SWGQueryParamCollection.h"
 
 @implementation SWGApiClient
 
@@ -30,13 +31,13 @@ static bool loggingEnabled = true;
                                       diskSize: (unsigned long) diskSize {
     NSAssert(memorySize > 0, @"invalid in-memory cache size");
     NSAssert(diskSize >= 0, @"invalid disk cache size");
-    
+
     NSURLCache *cache =
     [[NSURLCache alloc]
      initWithMemoryCapacity:memorySize
      diskCapacity:diskSize
      diskPath:@"swagger_url_cache"];
-    
+
     [NSURLCache setSharedURLCache:cache];
 }
 
@@ -53,17 +54,17 @@ static bool loggingEnabled = true;
         // setup static vars
         // create queue
         sharedQueue = [[NSOperationQueue alloc] init];
-        
+
         // create pool
         _pool = [[NSMutableDictionary alloc] init];
-        
+
         // initialize URL cache
         [SWGApiClient configureCacheWithMemoryAndDiskCapacity:4*1024*1024 diskSize:32*1024*1024];
-        
+
         // configure reachability
         [SWGApiClient configureCacheReachibilityForHost:baseUrl];
     }
-    
+
     @synchronized(self) {
         SWGApiClient * client = [_pool objectForKey:baseUrl];
         if (client == nil) {
@@ -127,7 +128,7 @@ static bool loggingEnabled = true;
             return TRUE;
         else return FALSE;
     }];
-    
+
     if(matchingItems.count == 1) {
         if(loggingEnabled)
             NSLog(@"removing request id %@", requestId);
@@ -168,19 +169,19 @@ static bool loggingEnabled = true;
                     NSLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
                 [SWGApiClient setOfflineState:true];
                 break;
-                
+
             case AFNetworkReachabilityStatusNotReachable:
                 if(loggingEnabled)
                     NSLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
                 [SWGApiClient setOfflineState:true];
                 break;
-                
+
             case AFNetworkReachabilityStatusReachableViaWWAN:
                 if(loggingEnabled)
                     NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
                 [SWGApiClient setOfflineState:false];
                 break;
-                
+
             case AFNetworkReachabilityStatusReachableViaWiFi:
                 if(loggingEnabled)
                     NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
@@ -201,21 +202,52 @@ static bool loggingEnabled = true;
                              queryParams:(NSDictionary*) queryParams {
     NSString * separator = nil;
     int counter = 0;
-    
+
     NSMutableString * requestUrl = [NSMutableString stringWithFormat:@"%@", path];
     if(queryParams != nil){
         for(NSString * key in [queryParams keyEnumerator]){
             if(counter == 0) separator = @"?";
             else separator = @"&";
             NSString * value;
-            if([[queryParams valueForKey:key] isKindOfClass:[NSString class]]){
-                value = [SWGApiClient escape:[queryParams valueForKey:key]];
+            id queryParam = [queryParams valueForKey:key];
+            if([queryParam isKindOfClass:[NSString class]]){
+                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                                          [SWGApiClient escape:key], [SWGApiClient escape:[queryParams valueForKey:key]]]];
+            }
+            else if([queryParam isKindOfClass:[SWGQueryParamCollection class]]){
+                SWGQueryParamCollection * coll = (SWGQueryParamCollection*) queryParam;
+                NSArray* values = [coll values];
+                NSString* format = [coll format];
+
+                if([format isEqualToString:@"csv"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@","]]]];
+
+                }
+                else if([format isEqualToString:@"tsv"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"\t"]]]];
+
+                }
+                else if([format isEqualToString:@"pipes"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"|"]]]];
+
+                }
+                else if([format isEqualToString:@"multi"]) {
+                    for(id obj in values) {
+                        [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                            [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", obj]]];
+                        counter += 1;
+                    }
+
+                }
             }
             else {
-                value = [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]];
+                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                                          [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]]]];
             }
-            [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                                      [SWGApiClient escape:key], value]];
+
             counter += 1;
         }
     }
@@ -242,7 +274,28 @@ static bool loggingEnabled = true;
       requestContentType: (NSString*) requestContentType
      responseContentType: (NSString*) responseContentType
          completionBlock: (void (^)(NSDictionary*, NSError *))completionBlock {
-    
+    // setting request serializer
+    if ([requestContentType isEqualToString:@"application/json"]) {
+        self.requestSerializer = [AFJSONRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else {
+        NSAssert(false, @"unsupport request type %@", requestContentType);
+    }
+
+    // setting response serializer
+    if ([responseContentType isEqualToString:@"application/json"]) {
+        self.responseSerializer = [AFJSONResponseSerializer serializer];
+    }
+    else {
+        self.responseSerializer = [AFHTTPResponseSerializer serializer];
+    }
+
     NSMutableURLRequest * request = nil;
     if (body != nil && [body isKindOfClass:[NSArray class]]){
         SWGFile * file;
@@ -259,8 +312,9 @@ static bool loggingEnabled = true;
             }
         }
         NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-        
-        if(file != nil) {
+
+        // request with multipart form
+        if([requestContentType isEqualToString:@"multipart/form-data"]) {
             request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
                                                                    URLString: urlString
                                                                   parameters: nil
@@ -270,20 +324,32 @@ static bool loggingEnabled = true;
                                                            NSData* data = [params[key] dataUsingEncoding:NSUTF8StringEncoding];
                                                            [formData appendPartWithFormData: data name: key];
                                                        }
-                                                       
-                                                       [formData appendPartWithFileData: [file data]
-                                                                                   name: [file paramName]
-                                                                               fileName: [file name]
-                                                                               mimeType: [file mimeType]];
-                                                       
+
+                                                       if (file) {
+                                                           [formData appendPartWithFileData: [file data]
+                                                                                       name: [file paramName]
+                                                                                   fileName: [file name]
+                                                                                   mimeType: [file mimeType]];
+                                                       }
+
                                                    }
                                                                        error:nil];
         }
+        // request with form parameters or json
+        else {
+            NSString* pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
+            NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
+
+            request = [self.requestSerializer requestWithMethod:method
+                                                      URLString:urlString
+                                                     parameters:params
+                                                          error:nil];
+        }
     }
     else {
         NSString * pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
         NSString * urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
-        
+
         request = [self.requestSerializer requestWithMethod:method
                                                   URLString:urlString
                                                  parameters:body
@@ -305,11 +371,9 @@ static bool loggingEnabled = true;
         [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
     }
 
-    AFJSONRequestSerializer *requestSerializer = [AFJSONRequestSerializer serializer];
-
     if(body != nil) {
         if([body isKindOfClass:[NSDictionary class]] || [body isKindOfClass:[NSArray class]]){
-            [requestSerializer setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
+            [self.requestSerializer setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
         }
         else if ([body isKindOfClass:[SWGFile class]]) {}
         else {
@@ -321,16 +385,16 @@ static bool loggingEnabled = true;
             [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
         }
     }
-    [requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
-    
+    [self.requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
+
     // Always disable cookies!
     [request setHTTPShouldHandleCookies:NO];
-    
-    
+
+
     if (self.logRequests) {
         [self logRequest:request];
     }
-    
+
     NSNumber* requestId = [SWGApiClient queueRequest];
     AFHTTPRequestOperation *op =
     [self HTTPRequestOperationWithRequest:request
@@ -348,14 +412,14 @@ static bool loggingEnabled = true;
                  userInfo[SWGResponseObjectErrorKey] = operation.responseObject;
              }
              NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
-             
+
              if(self.logServerResponses)
                  [self logResponse:nil forRequest:request error:augmentedError];
              completionBlock(nil, augmentedError);
          }
      }
      ];
-    
+
     [self.operationQueue addOperation:op];
     return requestId;
 }
@@ -368,6 +432,28 @@ static bool loggingEnabled = true;
                      requestContentType: (NSString*) requestContentType
                     responseContentType: (NSString*) responseContentType
                         completionBlock: (void (^)(NSString*, NSError *))completionBlock {
+    // setting request serializer
+    if ([requestContentType isEqualToString:@"application/json"]) {
+        self.requestSerializer = [AFJSONRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else {
+        NSAssert(false, @"unsupport request type %@", requestContentType);
+    }
+
+    // setting response serializer
+    if ([responseContentType isEqualToString:@"application/json"]) {
+        self.responseSerializer = [AFJSONResponseSerializer serializer];
+    }
+    else {
+        self.responseSerializer = [AFHTTPResponseSerializer serializer];
+    }
+
     NSMutableURLRequest * request = nil;
     if (body != nil && [body isKindOfClass:[NSArray class]]){
         SWGFile * file;
@@ -384,31 +470,45 @@ static bool loggingEnabled = true;
             }
         }
         NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-        
-        if(file != nil) {
+
+        // request with multipart form
+        if([requestContentType isEqualToString:@"multipart/form-data"]) {
             request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
                                                                    URLString: urlString
                                                                   parameters: nil
                                                    constructingBodyWithBlock: ^(id<AFMultipartFormData> formData) {
-                                                       
+
                                                        for(NSString * key in params) {
                                                            NSData* data = [params[key] dataUsingEncoding:NSUTF8StringEncoding];
                                                            [formData appendPartWithFormData: data name: key];
                                                        }
-                                                       
-                                                       [formData appendPartWithFileData: [file data]
-                                                                                   name: [file paramName]
-                                                                               fileName: [file name]
-                                                                               mimeType: [file mimeType]];
-                                                       
+
+                                                       if (file) {
+                                                           [formData appendPartWithFileData: [file data]
+                                                                                       name: [file paramName]
+                                                                                   fileName: [file name]
+                                                                                   mimeType: [file mimeType]];
+                                                       }
+
                                                    }
                                                                        error:nil];
         }
+        // request with form parameters or json
+        else {
+            NSString* pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
+            NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
+
+            request = [self.requestSerializer requestWithMethod:method
+                                                      URLString:urlString
+                                                     parameters:params
+                                                          error:nil];
+        }
+
     }
     else {
         NSString * pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
         NSString * urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
-        
+
         request = [self.requestSerializer requestWithMethod: method
                                                   URLString: urlString
                                                  parameters: body
@@ -429,13 +529,11 @@ static bool loggingEnabled = true;
         NSLog(@"%@ cache disabled", path);
         [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
     }
-    
-    
-    AFJSONRequestSerializer *requestSerializer = [AFJSONRequestSerializer serializer];
+
 
     if(body != nil) {
         if([body isKindOfClass:[NSDictionary class]] || [body isKindOfClass:[NSArray class]]){
-            [requestSerializer setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
+            [self.requestSerializer setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
         }
         else if ([body isKindOfClass:[SWGFile class]]){}
         else {
@@ -447,12 +545,12 @@ static bool loggingEnabled = true;
             [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
         }
     }
-    [requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
+    [self.requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
+
 
-    
     // Always disable cookies!
     [request setHTTPShouldHandleCookies:NO];
-    
+
     NSNumber* requestId = [SWGApiClient queueRequest];
     AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
      success:^(AFHTTPRequestOperation *operation, id responseObject) {
@@ -470,15 +568,23 @@ static bool loggingEnabled = true;
                  userInfo[SWGResponseObjectErrorKey] = operation.responseObject;
              }
              NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
-             
+
              if(self.logServerResponses)
                  [self logResponse:nil forRequest:request error:augmentedError];
              completionBlock(nil, augmentedError);
          }
      }];
-    
+
     [self.operationQueue addOperation:op];
     return requestId;
 }
 
-@end
\ No newline at end of file
+@end
+
+
+
+
+
+
+
+
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGObject.h b/modules/swagger-codegen/src/main/resources/objc/SWGObject.h
index 031bae69279..ccec208abc0 100644
--- a/modules/swagger-codegen/src/main/resources/objc/SWGObject.h
+++ b/modules/swagger-codegen/src/main/resources/objc/SWGObject.h
@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
+#import "JSONModel.h"
 
-@interface SWGObject : NSObject
-- (id) initWithValues:(NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
+@interface SWGObject : JSONModel
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGObject.m b/modules/swagger-codegen/src/main/resources/objc/SWGObject.m
index 9b37b3592b1..1f897ab1d56 100644
--- a/modules/swagger-codegen/src/main/resources/objc/SWGObject.m
+++ b/modules/swagger-codegen/src/main/resources/objc/SWGObject.m
@@ -1,17 +1,4 @@
 #import "SWGObject.h"
 
 @implementation SWGObject
-
-- (id) initWithValues:(NSDictionary*)dict {
-    return self;
-}
-
-- (NSDictionary*) asDictionary{
-    return [NSDictionary init];
-}
-
-- (NSString*)description {
-    return [NSString stringWithFormat:@"%@ %@", [super description], [self asDictionary]];
-}
-
 @end
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.h b/modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.h
new file mode 100644
index 00000000000..3b771881b0f
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.h
@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+@interface SWGQueryParamCollection : NSObject
+
+@property(nonatomic, readonly) NSArray* values;
+@property(nonatomic, readonly) NSString* format;
+
+- (id) initWithValuesAndFormat: (NSArray*) values
+                        format: (NSString*) format;
+
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.m b/modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.m
new file mode 100644
index 00000000000..9ce319940dd
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/objc/SWGQueryParamCollection.m
@@ -0,0 +1,16 @@
+#import "SWGQueryParamCollection.h"
+
+@implementation SWGQueryParamCollection
+
+@synthesize values = _values;
+@synthesize format = _format;
+
+- (id) initWithValuesAndFormat: (NSArray*) values
+                        format: (NSString*) format {
+    _values = values;
+    _format = format;
+
+    return self;
+}
+
+@end
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
index ffead406a86..53e6895fe33 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-body.mustache
@@ -1,11 +1,15 @@
 {{#operations}}
 #import "{{classname}}.h"
 #import "SWGFile.h"
+#import "SWGQueryParamCollection.h"
 #import "SWGApiClient.h"
 {{#imports}}#import "{{import}}.h"
 {{/imports}}
 {{newline}}
 
+@interface {{classname}} ()
+    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
+@end
 
 @implementation {{classname}}
 static NSString * basePath = @"{{basePath}}";
@@ -33,18 +37,19 @@ static NSString * basePath = @"{{basePath}}";
 }
 
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
+    [self.defaultHeaders setValue:value forKey:key];
 }
 
 -(id) init {
     self = [super init];
+    self.defaultHeaders = [NSMutableDictionary dictionary];
     [self apiClient];
     return self;
 }
 
 -(void) setHeaderValue:(NSString*) value
            forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
+    [self.defaultHeaders setValue:value forKey:key];
 }
 
 -(unsigned long) requestQueueSize {
@@ -53,9 +58,15 @@ static NSString * basePath = @"{{basePath}}";
 
 
 {{#operation}}
+/*!
+ * {{{summary}}}
+ * {{{notes}}}
+{{#allParams}} * \param {{paramName}} {{{description}}}
+{{/allParams}} * \returns {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+ */
 -(NSNumber*) {{nickname}}WithCompletionBlock{{^allParams}}: {{/allParams}}{{#allParams}}{{#secondaryParam}} {{paramName}}{{/secondaryParam}}: ({{{dataType}}}) {{paramName}}
         {{/allParams}}
-        {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{returnType}} output, NSError* error))completionBlock{{/returnBaseType}}
+        {{#returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock{{/returnBaseType}}
         {{^returnBaseType}}{{#hasParams}}completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock{{/returnBaseType}} {
 
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@{{path}}", basePath];
@@ -67,14 +78,22 @@ static NSString * basePath = @"{{basePath}}";
     {{#pathParams}}[requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"{{baseName}}", @"}"]] withString: [SWGApiClient escape:{{paramName}}]];
     {{/pathParams}}
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[{{#consumes}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}}];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[{{#produces}}@"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}}];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    {{#queryParams}}if({{paramName}} != nil)
-        queryParams[@"{{baseName}}"] = {{paramName}};
+    {{#queryParams}}if({{paramName}} != nil) {
+        {{#collectionFormat}}
+        queryParams[@"{{baseName}}"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: {{baseName}} format: @"{{collectionFormat}}"];
+        {{/collectionFormat}}
+        {{^collectionFormat}}queryParams[@"{{baseName}}"] = {{paramName}};{{/collectionFormat}}
+    }
     {{/queryParams}}
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     {{#headerParams}}if({{paramName}} != nil)
         headerParams[@"{{baseName}}"] = {{paramName}};
     {{/headerParams}}
@@ -86,8 +105,8 @@ static NSString * basePath = @"{{basePath}}";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
@@ -95,8 +114,8 @@ static NSString * basePath = @"{{basePath}}";
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
@@ -111,7 +130,7 @@ static NSString * basePath = @"{{basePath}}";
     {{/bodyParam}}
     {{^bodyParam}}
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     {{#formParams}}
     {{#notFile}}
@@ -121,8 +140,10 @@ static NSString * basePath = @"{{basePath}}";
     if(bodyDictionary == nil) {
       bodyDictionary = [[NSMutableArray alloc] init];
     }
-    [bodyDictionary addObject:{{paramName}}];
-    {{paramName}}.paramName  = @"{{baseName}}";
+    if({{paramName}} != nil) {
+      [bodyDictionary addObject:{{paramName}}];
+      {{paramName}}.paramName  = @"{{baseName}}";
+    }
     {{/isFile}}
     if(bodyDictionary == nil) {
       bodyDictionary = [[NSMutableArray alloc] init];
@@ -167,4 +188,4 @@ static NSString * basePath = @"{{basePath}}";
 
 {{newline}}
 {{/operations}}
-@end
\ No newline at end of file
+@end
diff --git a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
index c42c02d5aff..0cdccf1b39b 100644
--- a/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/api-header.mustache
@@ -16,20 +16,17 @@
 /**
 
  {{{summary}}}
- {{#notes}}
- {{{notes}}}
- {{/notes}}
+ {{#notes}}{{{notes}}}{{/notes}}
 
- {{#allParams}}
- @param {{paramName}} {{description}}
+ {{#allParams}}@param {{paramName}} {{description}}
  {{/allParams}}
 
- return type: {{returnType}}
+ return type: {{{returnType}}}
  */
 -(NSNumber*) {{nickname}}WithCompletionBlock {{^allParams}}:{{/allParams}}{{#allParams}}{{#secondaryParam}}     {{paramName}}{{/secondaryParam}}:({{{dataType}}}) {{paramName}} {{#hasMore}}
 {{/hasMore}}{{/allParams}}
     {{#returnBaseType}}{{#hasParams}}
-    completionHandler: {{/hasParams}}(void (^)({{returnType}} output, NSError* error))completionBlock;{{/returnBaseType}}
+    completionHandler: {{/hasParams}}(void (^)({{{returnType}}} output, NSError* error))completionBlock;{{/returnBaseType}}
     {{^returnBaseType}}{{#hasParams}}
     completionHandler: {{/hasParams}}(void (^)(NSError* error))completionBlock;{{/returnBaseType}}
 
diff --git a/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache b/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache
index 9e4d31b6e8a..9a53eb2fa06 100644
--- a/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/apiBodyResponseWithContainer.mustache
@@ -25,11 +25,11 @@
                         {{returnBaseType}}* d = [[{{{returnBaseType}}} alloc]initWithString: dict];
                         {{/returnTypeIsPrimitive}}
                         {{^returnTypeIsPrimitive}}
-                        {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc]initWithValues: dict];
+                        {{{returnBaseType}}}* d = [[{{{returnBaseType}}} alloc] initWithDictionary:dict error:nil];
                         {{/returnTypeIsPrimitive}}
                         [objs addObject:d];
                     }
-                    completionBlock(objs, nil);
+                    completionBlock(({{{returnType}}})objs, nil);
                 }
                 {{/returnBaseType}}
                 {{/isListContainer}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache b/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache
index d27a9f601ed..ff2dcba7a47 100644
--- a/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/apiNonPrimitiveResponse.mustache
@@ -1,9 +1,9 @@
     {{^returnTypeIsPrimitive}}
     // comples response type
-    return [client dictionary: requestUrl 
-                       method: @"{{httpMethod}}" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
+    return [client dictionary: requestUrl
+                       method: @"{{httpMethod}}"
+                  queryParams: queryParams
+                         body: bodyDictionary
                  headerParams: headerParams
            requestContentType: requestContentType
           responseContentType: responseContentType
@@ -15,9 +15,9 @@
                 }
                 {{#returnType}}{{returnType}} result = nil;
                 if (data) {
-                    result = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc] {{#returnContainer}}{{#isMapContainer}}initWithDictionary{{/isMapContainer}}{{#isListContainer}}initWithValues{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}initWithValues  {{/returnContainer}}: data];
+                    result = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{returnBaseType}}} {{/instantiationType}} alloc] {{#returnContainer}}{{#isMapContainer}}initWithDictionary{{/isMapContainer}}{{#isListContainer}} initWithDictionary{{/isListContainer}}{{/returnContainer}}{{^returnContainer}} initWithDictionary{{/returnContainer}}:data error:nil];
                 }
                 {{#returnType}}completionBlock(result , nil);{{/returnType}}
                 {{/returnType}}
               }];
-    {{/returnTypeIsPrimitive}}
\ No newline at end of file
+    {{/returnTypeIsPrimitive}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
index 17d2ec80836..b728e6bb06c 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
@@ -1,81 +1,24 @@
 {{#models}}
 {{#model}}
-#import "SWGDate.h"
 #import "{{classname}}.h"
 
 @implementation {{classname}}
-
--(id){{#vars}}{{name}}: ({{datatype}}) {{name}}
-    {{/vars}}
-{{newline}}{
-    {{#vars}}_{{name}} = {{name}};
-    {{/vars}}
-
-    return self;
-}
-
--(id) initWithValues:(NSDictionary*)dict
+  
++ (JSONKeyMapper *)keyMapper
 {
-    self = [super init];
-    if(self) {
-        {{#vars}}{{#isPrimitiveType}}_{{name}} = dict[@"{{baseName}}"];{{/isPrimitiveType}}
-        {{#complexType}}
-        id {{name}}_dict = dict[@"{{baseName}}"];
-        {{#isContainer}}
-        if([{{name}}_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*){{name}}_dict count]];
-            if([(NSArray*){{name}}_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*){{name}}_dict) {
-                    {{{complexType}}}* d = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{complexType}}}{{/instantiationType}} alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _{{{name}}} = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _{{name}} = [[NSArray alloc] init];
-        }
-        else {
-            _{{name}} = [[NSArray alloc] init];
-        }
-        {{/isContainer}}{{#isNotContainer}}
-        if({{name}}_dict != nil)
-            _{{name}} = [[{{#instantiationType}}NSClassFromString(@"{{{instantiationType}}}") {{/instantiationType}}{{^instantiationType}}{{{complexType}}} {{/instantiationType}} alloc]{{setter}}:{{name}}_dict];
-        {{/isNotContainer}}
-        {{/complexType}}
-        {{/vars}}{{newline}}
-    }
-    return self;
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ {{#vars}}@"{{baseName}}": @"{{name}}"{{#hasMore}}, {{/hasMore}}{{/vars}} }];
 }
 
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    {{#vars}}
-    {{#complexType}}
-    if(_{{name}} != nil){
-        if([_{{name}} isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( {{complexType}} *{{name}} in (NSArray*)_{{name}}) {
-                [array addObject:[(SWGObject*){{name}} asDictionary]];
-            }
-            dict[@"{{name}}"] = array;
-        }
-        else if(_{{name}} && [_{{name}} isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_{{name}} toString];
-            if(dateString){
-                dict[@"{{name}}"] = dateString;
-            }
-        }
-        else {
-        {{/complexType}}
-            if(_{{name}} != nil) dict[@"{{baseName}}"] = {{#complexType}}[(SWGObject*){{/complexType}}_{{name}} {{#complexType}}asDictionary]{{/complexType}};
-        {{#complexType}}
-        }
-    }
-    {{/complexType}}
-    {{/vars}}
++ (BOOL)propertyIsOptional:(NSString *)propertyName
+{
+  NSArray *optionalProperties = @[{{#vars}}{{^required}}@"{{name}}"{{#hasMore}}, {{/hasMore}}{{/required}}{{/vars}}];
 
-    NSDictionary* output = [dict copy];
-    return output;
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
 }
 
 {{/model}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
index cb954f91210..81ac19a0b73 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-header.mustache
@@ -6,17 +6,17 @@
 {{#models}}
 {{#model}}
 
+@protocol {{classname}}
+@end
+  
 @interface {{classname}} : SWGObject
 
 {{#vars}}
-@property(nonatomic) {{datatype}} {{name}};  {{#description}}/* {{{description}}} {{#isNotRequired}}[optional]{{/isNotRequired}} */{{/description}}{{newline}}
+{{#description}}/* {{{description}}} {{^required}}[optional]{{/required}}
+ */{{/description}}
+@property(nonatomic) {{{ datatype }}} {{name}};
 {{/vars}}
-- (id) {{#vars}}{{name}}: ({{datatype}}) {{name}}{{#hasMore}}{{newline}}     {{/hasMore}}{{^hasMore}};{{/hasMore}}
-    {{/vars}}
-{{newline}}
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
-{{newline}}
+
 @end
 {{/model}}
-{{/models}}
\ No newline at end of file
+{{/models}}
diff --git a/samples/client/petstore/php/Swagger.php b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
similarity index 84%
rename from samples/client/petstore/php/Swagger.php
rename to modules/swagger-codegen/src/main/resources/php/APIClient.mustache
index 3d6b77d819e..5cfb953002b 100644
--- a/samples/client/petstore/php/Swagger.php
+++ b/modules/swagger-codegen/src/main/resources/php/APIClient.mustache
@@ -15,29 +15,26 @@
  *  limitations under the License.
  */
 
-/* Autoload the model definition files */
-/**
- *
- * @param string $className the class to attempt to load
- */
-function swagger_autoloader($className) {
-  $currentDir = dirname(__FILE__);
-  if (file_exists($currentDir . '/' . $className . '.php')) {
-    include $currentDir . '/' . $className . '.php';
-  } elseif (file_exists($currentDir . '/models/' . $className . '.php')) {
-    include $currentDir . '/models/' . $className . '.php';
-  }
-}
-spl_autoload_register('swagger_autoloader');
-
+namespace {{invokerPackage}};
 
 class APIClient {
 
+  public static $PATCH = "PATCH";
   public static $POST = "POST";
   public static $GET = "GET";
   public static $PUT = "PUT";
   public static $DELETE = "DELETE";
 
+  /*
+   * @var string timeout (second) of the HTTP request, by default set to 0, no timeout
+   */
+  protected $curl_timeout = 0;
+
+  /*
+   * @var string user agent of the HTTP request, set to "PHP-Swagger" by default
+   */
+  protected $user_agent = "PHP-Swagger";
+
   /**
    * @param string $host the address of the API server
    * @param string $headerName a header to pass on requests 
@@ -67,7 +64,7 @@ class APIClient {
     if (!is_numeric($seconds)) {
       throw new Exception('Timeout variable must be numeric.');
     }
-    $this->curl_timout = $seconds;
+    $this->curl_timeout = $seconds;
   }
 
   /**
@@ -97,15 +94,16 @@ class APIClient {
       $headers[] = $this->headerName . ": " . $this->headerValue;
     }
 
-    if (strpos($headers['Content-Type'], "multipart/form-data") < 0 and (is_object($postData) or is_array($postData))) {
+    if ((isset($headerName['Content-Type']) and strpos($headerName['Content-Type'], "multipart/form-data") === FALSE) and (is_object($postData) or is_array($postData))) {
       $postData = json_encode($this->sanitizeForSerialization($postData));
     }
 
     $url = $this->host . $resourcePath;
 
     $curl = curl_init();
-    if ($this->curl_timout) {
-      curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timout);
+    // set timeout, if needed
+    if ($this->curl_timeout != 0) {
+      curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
     }
     // return the result on success, rather than just TRUE
     curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
@@ -133,11 +131,7 @@ class APIClient {
     curl_setopt($curl, CURLOPT_URL, $url);
 
     // Set user agent
-    if ($this->user_agent) {
-      curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
-    } else { // use PHP-Swagger as the default user agent
-      curl_setopt($curl, CURLOPT_USERAGENT, 'PHP-Swagger');
-    }
+    curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
 
     // Make the request
     $response = curl_exec($curl);
@@ -199,7 +193,7 @@ class APIClient {
    * @return string the serialized object
    */
   public static function toPathValue($value) {
-      return rawurlencode(toString($value));
+      return rawurlencode(self::toString($value));
   }
 
   /**
@@ -214,7 +208,7 @@ class APIClient {
         if (is_array($object)) {
             return implode(',', $object);
         } else {
-            return toString($object);
+            return self::toString($object);
         }
   }
 
@@ -226,7 +220,7 @@ class APIClient {
    * @return string the header string
    */
   public static function toHeaderValue($value) {
-      return toString($value);
+      return self::toString($value);
   }
 
   /**
@@ -237,7 +231,7 @@ class APIClient {
    * @return string the form string
    */
   public static function toFormValue($value) {
-      return toString($value);
+      return self::toString($value);
   }
 
   /**
@@ -288,14 +282,15 @@ class APIClient {
       $deserialized = $values;
     } elseif ($class == 'DateTime') {
       $deserialized = new \DateTime($data);
-    } elseif (in_array($class, array('string', 'int', 'float', 'bool'))) {
+    } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool'))) {
       settype($data, $class);
       $deserialized = $data;
     } else {
+      $class = "{{invokerPackage}}\\models\\".$class;
       $instance = new $class();
       foreach ($instance::$swaggerTypes as $property => $type) {
-        if (isset($data->$property)) {
-          $original_property_name = $instance::$attributeMap[$property];
+        $original_property_name = $instance::$attributeMap[$property];
+        if (isset($original_property_name)) {
           $instance->$property = self::deserialize($data->$original_property_name, $type);
         }
       }
@@ -307,20 +302,3 @@ class APIClient {
 
 }
 
-class APIClientException extends Exception {
-  protected $response, $response_info;
-
-  public function __construct($message="", $code=0, $response_info=null, $response=null) {
-    parent::__construct($message, $code);
-    $this->response_info = $response_info;
-    $this->response = $response;
-  }
-
-  public function getResponse() {
-    return $this->response;
-  }
-
-  public function getResponseInfo() {
-    return $this->response_info;
-  }
-}
diff --git a/modules/swagger-codegen/src/main/resources/php/APIClientException.mustache b/modules/swagger-codegen/src/main/resources/php/APIClientException.mustache
new file mode 100644
index 00000000000..3cf74d69288
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/APIClientException.mustache
@@ -0,0 +1,38 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+namespace {{invokerPackage}};
+
+use \Exception;
+
+class APIClientException extends Exception {
+  protected $response, $response_info;
+
+  public function __construct($message="", $code=0, $response_info=null, $response=null) {
+    parent::__construct($message, $code);
+    $this->response_info = $response_info;
+    $this->response = $response;
+  }
+
+  public function getResponse() {
+    return $this->response;
+  }
+
+  public function getResponseInfo() {
+    return $this->response_info;
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/php/api.mustache b/modules/swagger-codegen/src/main/resources/php/api.mustache
index bdf66defcaf..a434699f90a 100644
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@@ -19,69 +19,79 @@
  *
  * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
  */
+
+namespace {{invokerPackage}};
+
 {{#operations}}
 class {{classname}} {
 
-	function __construct($apiClient) {
-	  $this->apiClient = $apiClient;
-	}
+  function __construct($apiClient) {
+    $this->apiClient = $apiClient;
+  }
 
   {{#operation}}
-	/**
-	 * {{{nickname}}}
+  /**
+   * {{{nickname}}}
    *
-	 * {{{summary}}}
-   {{#allParams}}* {{paramName}}, {{dataType}}: {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
-   * {{/allParams}}
-	 * @return {{{returnType}}}
-	 */
-
+   * {{{summary}}}
+   *
+{{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
+{{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+   */
    public function {{nickname}}({{#allParams}}${{paramName}}{{#optional}}=null{{/optional}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
 
-  		// parse inputs
-  		$resourcePath = "{{path}}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "{{httpMethod}}";
+      // parse inputs
+      $resourcePath = "{{path}}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "{{httpMethod}}";
+      $httpBody = '';
       $queryParams = array();
       $headerParams = array();
       $formParams = array();
-      $headerParams['Accept'] = '{{#produces}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/produces}}';
-      $headerParams['Content-Type'] = '{{#consumes}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/consumes}}';
+      $_header_accept = '{{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array({{#consumes}}'{{mediaType}}'{{#hasMore}},{{/hasMore}}{{/consumes}});
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
 
       {{#queryParams}}// query params
       if(${{paramName}} !== null) {
-  		  $queryParams['{{baseName}}'] = $this->apiClient->toQueryValue(${{paramName}});
-  		}{{/queryParams}}
+        $queryParams['{{baseName}}'] = $this->apiClient->toQueryValue(${{paramName}});
+      }{{/queryParams}}
       {{#headerParams}}// header params
       if(${{paramName}} !== null) {
-  		 	$headerParams['{{baseName}}'] = $this->apiClient->toHeaderValue(${{paramName}});
-  		}{{/headerParams}}
+        $headerParams['{{baseName}}'] = $this->apiClient->toHeaderValue(${{paramName}});
+      }{{/headerParams}}
       {{#pathParams}}// path params
       if(${{paramName}} !== null) {
-  			$resourcePath = str_replace("{" . "{{baseName}}" . "}",
-  			                            $this->apiClient->toPathValue(${{paramName}}), $resourcePath);
-  		}{{/pathParams}}
+        $resourcePath = str_replace("{" . "{{baseName}}" . "}",
+                                    $this->apiClient->toPathValue(${{paramName}}), $resourcePath);
+      }{{/pathParams}}
       {{#formParams}}// form params
       if (${{paramName}} !== null) {
         $formParams['{{baseName}}'] = {{#isFile}}'@' . {{/isFile}}$this->apiClient->toFormValue(${{paramName}});
       }{{/formParams}}
       {{#bodyParams}}// body params
-      $body = null;
+      $_tempBody = null;
       if (isset(${{paramName}})) {
-        $body = ${{paramName}};
+        $_tempBody = ${{paramName}};
       }{{/bodyParams}}
 
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
       // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
       }
 
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
 
       {{#returnType}}if(! $response) {
         return null;
diff --git a/modules/swagger-codegen/src/main/resources/php/composer.mustache b/modules/swagger-codegen/src/main/resources/php/composer.mustache
new file mode 100644
index 00000000000..fb47a865834
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/composer.mustache
@@ -0,0 +1,32 @@
+{
+  "name": "{{invokerPackage}}/{{invokerPackage}}-php",
+  "description": "{{description}}",
+  "keywords": [
+    "swagger",
+    "php",
+    "sdk",
+    "api"
+  ],
+  "homepage": "http://swagger.io",
+  "license": "Apache v2",
+  "authors": [
+    {
+      "name": "Swagger and contributors",
+      "homepage": "https://github.com/swagger-api/swagger-codegen"
+    }
+  ],
+  "require": {
+    "php": ">=5.3.3",
+    "ext-curl": "*",
+    "ext-json": "*",
+    "ext-mbstring": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.0",
+    "satooshi/php-coveralls": "~0.6.1",
+    "squizlabs/php_codesniffer": "~2.0"
+  },
+  "autoload": {
+    "psr-4": { "{{invokerPackage}}\\" : "lib/" }
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/php/model.mustache b/modules/swagger-codegen/src/main/resources/php/model.mustache
index 4540f973633..614334353de 100644
--- a/modules/swagger-codegen/src/main/resources/php/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/model.mustache
@@ -15,14 +15,18 @@
  *  limitations under the License.
  */
 
+{{#models}}
+{{#model}}
 /**
- * $model.description$
+ * {{description}}
  *
  * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
  *
  */
-{{#models}}
-{{#model}}
+
+namespace {{invokerPackage}}\models;
+
+use \ArrayAccess;
 
 class {{classname}} implements ArrayAccess {
   static $swaggerTypes = array(
@@ -41,7 +45,7 @@ class {{classname}} implements ArrayAccess {
   */{{/description}}
   public ${{name}}; /* {{{datatype}}} */{{/vars}}
 
-  public function __construct(array $data) {
+  public function __construct(array $data = null) {
     {{#vars}}$this->{{name}} = $data["{{name}}"];{{#hasMore}}
     {{/hasMore}}{{/vars}}
   }
diff --git a/modules/swagger-codegen/src/main/resources/php/require.mustache b/modules/swagger-codegen/src/main/resources/php/require.mustache
new file mode 100644
index 00000000000..058aa169504
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/php/require.mustache
@@ -0,0 +1,16 @@
+<?php
+// source code generated by http://restunited.com
+// for any feedback/issue, please send to feedback{at}restunited.com
+
+// load models defined for endpoints
+foreach (glob(dirname(__FILE__)."/lib/models/*.php") as $filename)
+{
+      require_once $filename;
+}
+
+// load classes for accessing the endpoints
+foreach (glob(dirname(__FILE__)."/lib/*.php") as $filename)
+{
+      require_once $filename;
+}
+?>
diff --git a/modules/swagger-codegen/src/main/resources/python/README.mustache b/modules/swagger-codegen/src/main/resources/python/README.mustache
index cf1f7142bc0..3b69aba0f82 100644
--- a/modules/swagger-codegen/src/main/resources/python/README.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/README.mustache
@@ -1,25 +1,42 @@
-# Swagger Generated Python client
+## Requirements.
+Python 2.7 and later.
 
+## Setuptools
+You can install the bindings via [Setuptools](http://pypi.python.org/pypi/setuptools).
 
-Usage example, based on the swagger petstore:
+```sh
+python setup.py install
+```
+
+Or you can install from Github via pip:
+
+```sh
+pip install git+https://github.com/geekerzp/SwaggerPetstore-python.git
+```
+
+To use the bindings, import the pacakge:
 
 ```python
-# include the client module
-from client import *
-
-# build a client connection.  In this example, we are passing the hostname as arg0, and
-# sending a header with name `api_key` and value `special-key` on each call to the api.
-
-client = swagger.ApiClient('http://petstore.swagger.io/v2', 'api_key', 'special-key')
-
-# create the PetApi class with the client we just created
-petApi = PetApi.PetApi(client)
-
-# call the API and fetch a pet, with petId=3
-pet = petApi.getPetById(petId=3)
-
-# write it into pretty JSON
-json = client.sanitizeForSerialization(pet)
-print json
-{'category': {'category': None, 'status': None, 'name': 'string', 'tags': None, 'photoUrls': None, 'id': 0L}, 'status': {'category': None, 'status': None, 'name': None, 'tags': None, 'photoUrls': None, 'id': None}, 'name': 'foogly', 'tags': [{'id': 0L, 'name': 'string'}], 'photoUrls': ['string'], 'id': 3L}
+import SwaggerPetstore
 ```
+
+## Manual Installation
+If you do not wish to use setuptools, you can download the latest release.
+Then, to use the bindings, import the package:
+
+```python
+import path.to.SwaggerPetstore-python.SwaggerPetstore
+```
+
+## Getting Started
+
+TODO
+
+## Documentation
+
+TODO
+
+## Tests
+
+TODO
+
diff --git a/modules/swagger-codegen/src/main/resources/python/__init__.mustache b/modules/swagger-codegen/src/main/resources/python/__init__model.mustache
similarity index 73%
rename from modules/swagger-codegen/src/main/resources/python/__init__.mustache
rename to modules/swagger-codegen/src/main/resources/python/__init__model.mustache
index 728aacbb9ab..93d18228d25 100644
--- a/modules/swagger-codegen/src/main/resources/python/__init__.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/__init__model.mustache
@@ -2,6 +2,10 @@
 """Add all of the modules in the current directory to __all__"""
 import os
 
+{{#models}}{{#model}}
+from .{{classVarName}} import {{classname}}
+{{/model}}{{/models}}
+
 __all__ = []
 
 for module in os.listdir(os.path.dirname(__file__)):
diff --git a/modules/swagger-codegen/src/main/resources/python/__init__package.mustache b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
new file mode 100644
index 00000000000..e88c5f01ee2
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/python/__init__package.mustache
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+"""Add all of the modules in the current directory to __all__"""
+import os
+
+# import models into package
+{{#models}}{{#model}}
+from .models.{{classVarName}} import {{classname}}
+{{/model}}{{/models}}
+
+# import apis into package
+{{#apiInfo}}{{#apis}}
+from .{{classVarName}} import {{classname}}
+{{/apis}}{{/apiInfo}}
+
+# import ApiClient
+from .swagger import ApiClient
+
+__all__ = []
+
+for module in os.listdir(os.path.dirname(__file__)):
+  if module != '__init__.py' and module[-3:] == '.py':
+    __all__.append(module[:-3])
diff --git a/modules/swagger-codegen/src/main/resources/python/api.mustache b/modules/swagger-codegen/src/main/resources/python/api.mustache
index 32c10a00fa5..ba17e6993a2 100644
--- a/modules/swagger-codegen/src/main/resources/python/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api.mustache
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# coding: utf-8
+
 """
 {{classname}}.py
 Copyright 2015 Reverb Technologies, Inc.
@@ -19,6 +21,7 @@ NOTE: This class is auto generated by the swagger code generator program. Do not
 """
 import sys
 import os
+import urllib
 
 from models import *
 
@@ -32,14 +35,13 @@ class {{classname}}(object):
     {{newline}}
     {{#operation}}
     def {{nickname}}(self, {{#requiredParams}}{{paramName}}{{#defaultValue}} = None{{/defaultValue}}, {{/requiredParams}}**kwargs):
-        """{{summary}}
+        """{{{summary}}}
+        {{{notes}}}
 
         Args:
-            {{#allParams}}
-            {{paramName}}, {{dataType}}: {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
-            {{newline}}
+            {{#allParams}}{{paramName}}, {{dataType}}: {{{description}}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
             {{/allParams}}
-        {{newline}}
+
         Returns: {{returnType}}
         """
 
@@ -62,29 +64,33 @@ class {{classname}}(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = '{{#produces}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/produces}}';
-        headerParams['Content-Type'] = '{{#consumes}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/consumes}}';
+        accepts = [{{#produces}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/produces}}]
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = [{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}]
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         {{#queryParams}}
         if ('{{paramName}}' in params):
-            queryParams['{{paramName}}'] = self.apiClient.toPathValue(params['{{paramName}}'])
+            queryParams['{{baseName}}'] = self.apiClient.toPathValue(params['{{paramName}}'])
         {{/queryParams}}
 
         {{#headerParams}}
         if ('{{paramName}}' in params):
-            headerParams['{{paramName}}'] = params['{{paramName}}']
+            headerParams['{{baseName}}'] = params['{{paramName}}']
         {{/headerParams}}
 
         {{#pathParams}}
         if ('{{paramName}}' in params):
             replacement = str(self.apiClient.toPathValue(params['{{paramName}}']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + '{{baseName}}' + '}',
                                                 replacement)
         {{/pathParams}}
 
         {{#formParams}}
         if ('{{paramName}}' in params):
-            {{#notFile}}formParams['{{paramName}}'] = params['{{paramName}}']{{/notFile}}{{#isFile}}files['{{paramName}}'] = params['{{paramName}}']{{/isFile}}
+            {{#notFile}}formParams['{{baseName}}'] = params['{{paramName}}']{{/notFile}}{{#isFile}}files['{{baseName}}'] = params['{{paramName}}']{{/isFile}}
         {{/formParams}}
 
         {{#bodyParam}}
diff --git a/modules/swagger-codegen/src/main/resources/python/model.mustache b/modules/swagger-codegen/src/main/resources/python/model.mustache
index ff81820ca33..e46c63df637 100644
--- a/modules/swagger-codegen/src/main/resources/python/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/model.mustache
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# coding: utf-8
+
 """
 Copyright 2015 Reverb Technologies, Inc.
 
@@ -39,7 +41,7 @@ class {{classname}}(object):
             {{#vars}}
             '{{name}}': '{{baseName}}'{{#hasMore}},{{/hasMore}}
             {{/vars}}
-        }       
+        }
 
         {{#vars}}
         {{#description}}#{{description}}
diff --git a/modules/swagger-codegen/src/main/resources/python/setup.mustache b/modules/swagger-codegen/src/main/resources/python/setup.mustache
new file mode 100644
index 00000000000..d10da4c68d0
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/python/setup.mustache
@@ -0,0 +1,32 @@
+import sys
+from setuptools import setup, find_packages
+
+{{#apiInfo}}{{#apis}}{{^hasMore}}
+
+# To install the library, open a Terminal shell, then run this
+# file by typing:
+#
+# python setup.py install
+#
+# You need to have the setuptools module installed.
+# Try reading the setuptools documentation:
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = []
+
+setup(
+    name="{{module}}",
+    version="{{version}}",
+    description="{{appName}}",
+    author_email="{{infoEmail}}",
+    url="{{infoUrl}}",
+    keywords=["Swagger", "{{appName}}"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    include_package_data=True,
+    long_description="""\
+    {{appDescription}}
+    """
+)
+
+{{/hasMore}}{{/apis}}{{/apiInfo}}
diff --git a/modules/swagger-codegen/src/main/resources/python/swagger.mustache b/modules/swagger-codegen/src/main/resources/python/swagger.mustache
index 1cfc60981be..10ac54d527d 100644
--- a/modules/swagger-codegen/src/main/resources/python/swagger.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/swagger.mustache
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# coding: utf-8
+
 """Swagger generic API client. This client handles the client-
 server communication, and is invariant across implementations. Specifics of
 the methods and models for each application are generated from the Swagger
@@ -15,8 +17,7 @@ import datetime
 import mimetypes
 import random
 import string
-
-from models import *
+import models
 
 
 class ApiClient(object):
@@ -28,23 +29,37 @@ class ApiClient(object):
     headerValue: a header value to pass when making calls to the API
   """
   def __init__(self, host=None, headerName=None, headerValue=None):
-    self.headerName = headerName
-    self.headerValue = headerValue
+    self.defaultHeaders = {}
+    if (headerName is not None):
+      self.defaultHeaders[headerName] = headerValue
     self.host = host
     self.cookie = None
     self.boundary = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(30))
+    # Set default User-Agent.
+    self.user_agent = 'Python-Swagger'
+
+  @property
+  def user_agent(self):
+    return self.defaultHeaders['User-Agent']
+
+  @user_agent.setter
+  def user_agent(self, value):
+    self.defaultHeaders['User-Agent'] = value
+
+  def setDefaultHeader(self, headerName, headerValue):
+    self.defaultHeaders[headerName] = headerValue
 
   def callAPI(self, resourcePath, method, queryParams, postData,
               headerParams=None, files=None):
 
     url = self.host + resourcePath
-    headers = {}
-    if headerParams:
-      for param, value in headerParams.iteritems():
-        headers[param] = ApiClient.sanitizeForSerialization(value)
 
-    if self.headerName:
-      headers[self.headerName] = ApiClient.sanitizeForSerialization(self.headerValue)
+    mergedHeaderParams = self.defaultHeaders.copy()
+    mergedHeaderParams.update(headerParams)
+    headers = {}
+    if mergedHeaderParams:
+      for param, value in mergedHeaderParams.iteritems():
+        headers[param] = ApiClient.sanitizeForSerialization(value)
 
     if self.cookie:
       headers['Cookie'] = ApiClient.sanitizeForSerialization(self.cookie)
@@ -66,12 +81,14 @@ class ApiClient(object):
     elif method in ['POST', 'PUT', 'DELETE']:
       if postData:
         postData = ApiClient.sanitizeForSerialization(postData)
-        if 'Content-type' not in headers:
-          headers['Content-type'] = 'application/json'
+        if 'Content-Type' not in headers:
+          headers['Content-Type'] = 'application/json'
           data = json.dumps(postData)
-        elif headers['Content-type'] == 'multipart/form-data':
+        elif headers['Content-Type'] == 'application/json':
+          data = json.dumps(postData)
+        elif headers['Content-Type'] == 'multipart/form-data':
           data = self.buildMultipartFormData(postData, files)
-          headers['Content-type'] = 'multipart/form-data; boundary={0}'.format(self.boundary)
+          headers['Content-Type'] = 'multipart/form-data; boundary={0}'.format(self.boundary)
           headers['Content-length'] = str(len(data))
         else:
             data = urllib.urlencode(postData)
@@ -103,9 +120,9 @@ class ApiClient(object):
         string -- quoted value
     """
     if type(obj) == list:
-      return urllib.quote(','.join(obj))
+      return ','.join(obj)
     else:
-      return urllib.quote(str(obj))
+      return str(obj)
 
   @staticmethod
   def sanitizeForSerialization(obj):
@@ -193,7 +210,7 @@ class ApiClient(object):
       if (objClass in ['int', 'float', 'long', 'dict', 'list', 'str', 'bool', 'datetime']):
         objClass = eval(objClass)
       else:  # not a native type, must be model class
-        objClass = eval(objClass + '.' + objClass)
+        objClass = eval('models.' + objClass)
 
     if objClass in [int, long, float, dict, list, str, bool]:
       return objClass(obj)
diff --git a/modules/swagger-codegen/src/main/resources/python3/api.mustache b/modules/swagger-codegen/src/main/resources/python3/api.mustache
index 85159571f65..cec4482a569 100644
--- a/modules/swagger-codegen/src/main/resources/python3/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/python3/api.mustache
@@ -32,14 +32,13 @@ class {{classname}}(object):
     {{newline}}
     {{#operation}}
     def {{nickname}}(self, {{#requiredParams}}{{paramName}}{{#defaultValue}} = None{{/defaultValue}}, {{/requiredParams}}**kwargs):
-        """{{summary}}
+        """{{{summary}}}
+        {{{notes}}}
 
         Args:
-            {{#allParams}}
-            {{paramName}}, {{dataType}}: {{description}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
-            {{newline}}
+            {{#allParams}}{{paramName}}, {{dataType}}: {{{description}}} {{^optional}}(required){{/optional}}{{#optional}}(optional){{/optional}}
             {{/allParams}}
-        {{newline}}
+
         Returns: {{returnType}}
         """
 
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api.mustache b/modules/swagger-codegen/src/main/resources/ruby/api.mustache
index c045a46f69c..5b0d3732283 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api.mustache
@@ -4,84 +4,69 @@ require "uri"
 class {{classname}}
   basePath = "{{basePath}}"
   # apiInvoker = APIInvoker
+{{#operation}}
+{{newline}}
+  # {{summary}}
+  # {{notes}}
+{{#allParams}}{{#required}}  # @param {{paramName}} {{description}}
+{{/required}}{{/allParams}}  # @param [Hash] opts the optional parameters
+{{#allParams}}{{^required}}  # @option opts [{{dataType}}] :{{paramName}} {{description}}
+{{/required}}{{/allParams}}  # @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+  def self.{{nickname}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}opts = {})
+    # verify existence of params{{#allParams}}{{#required}}
+    raise "{{{paramName}}} is required" if {{{paramName}}}.nil?{{/required}}{{/allParams}}
 
-  def self.escapeString(string)
-    URI.encode(string.to_s)
-  end
+    # resource path
+    path = "{{path}}".sub('{format}','json'){{#pathParams}}.sub('{' + '{{baseName}}' + '}', {{paramName}}.to_s){{/pathParams}}
 
-  {{#operation}}
-  def self.{{nickname}} ({{#allParams}}{{paramName}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}},{{/allParams}} opts={})
-    query_param_keys = [{{#queryParams}}:{{paramName}}{{#hasMore}},{{/hasMore}}{{/queryParams}}]
+    # query parameters
+    query_params = {}{{#queryParams}}{{#required}}
+    query_params[:'{{{baseName}}}'] = {{{paramName}}}{{/required}}{{/queryParams}}{{#queryParams}}{{^required}}
+    query_params[:'{{{baseName}}}'] = opts[:'{{{paramName}}}'] if opts[:'{{{paramName}}}']{{/required}}{{/queryParams}}
 
-    {{#requiredParamCount}}
-    
-    # verify existence of params
-    {{#requiredParams}}
-    raise "{{{paramName}}} is required" if {{{paramName}}}.nil?
-    {{/requiredParams}}
-    {{/requiredParamCount}}
-    
-    # set default values and merge with input
-    options = {
-      {{#allParams}}:'{{paramName}}' => {{paramName}}{{#hasMore}},{{/hasMore}}
-      {{/allParams}}
-    }.merge(opts)
+    # header parameters
+    header_params = {}
 
-    #resource path
-    path = "{{path}}".sub('{format}','json'){{#pathParams}}.sub('{' + '{{baseName}}' + '}', escapeString({{paramName}}))
-    {{/pathParams}}{{newline}}
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
+    _header_accept = '{{#produces}}{{mediaType}}{{#hasMore}}, {{/hasMore}}{{/produces}}'
+    header_params['Accept'] = _header_accept if _header_accept != ''
 
-    # header parameters, if any
-    headers = {}
-    {{#headerParams}}{{#optional}}headers[:'{{{baseName}}}'] = options[:'{{{paramName}}}'] if options[:'{{{paramName}}}']{{/optional}}{{/headerParams}}
-    {{#headerParams}}{{^optional}}headers[:'{{{baseName}}}'] = {{{paramName}}}{{/optional}}{{/headerParams}}
-
-    # http body (model)
-    post_body = nil
-    {{#bodyParam}}
-    if body != nil
-      if body.is_a?(Array)
-        array = Array.new
-        body.each do |item|
-          if item.respond_to?("to_body".to_sym)
-            array.push item.to_body
-          else
-            array.push item
-          end
-        end
-        post_body = array
-
-      else 
-        if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
-      end
-    end
-    {{/bodyParam}}
+    _header_content_type = [{{#consumes}}'{{mediaType}}'{{#hasMore}}, {{/hasMore}}{{/consumes}}]
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'{{#headerParams}}{{#required}}
+    header_params[:'{{{baseName}}}'] = {{{paramName}}}{{/required}}{{/headerParams}}{{#headerParams}}{{^required}}
+    header_params[:'{{{baseName}}}'] = opts[:'{{{paramName}}}'] if opts[:'{{{paramName}}}']{{/required}}{{/headerParams}}
 
     # form parameters
-    form_parameter_hash = {}
-    {{#formParams}}{{#optional}}form_parameter_hash["{{baseName}}"] = options[:'{{paramName}}'] if options[:'{{paramName}}']{{/optional}}
-    {{^optional}}form_parameter_hash["{{baseName}}"] = {{paramName}}{{/optional}}{{/formParams}}
+    form_params = {}{{#formParams}}{{#required}}
+    form_params["{{baseName}}"] = {{paramName}}{{/required}}{{/formParams}}{{#formParams}}{{^required}}
+    form_params["{{baseName}}"] = opts[:'{{paramName}}'] if opts[:'{{paramName}}']{{/required}}{{/formParams}}
 
-    {{#returnType}}
-    response = Swagger::Request.new(:{{httpMethod}}, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-    {{#returnContainer}}
-    response.map {|response|{{/returnContainer}} {{returnBaseType}}.new(response){{#returnContainer}} }{{/returnContainer}}
-    {{/returnType}}
-    {{^returnType}}
-    Swagger::Request.new(:{{httpMethod}}, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    {{/returnType}}
-  {{newline}}
+    # http body (model)
+    post_body = nil{{#bodyParam}}
+    _body_param = {{#required}}{{{paramName}}}{{/required}}{{^required}}opts[:'{{{paramName}}}']{{/required}}
+    if _body_param != nil
+      if _body_param.is_a?(Array)
+        _array = Array.new
+        _body_param.each do |item|
+          if item.respond_to?(:to_body)
+            _array.push item.to_body
+          else
+            _array.push item
+          end
+        end
+        post_body = _array
+      else 
+        if _body_param.respond_to?(:to_body)
+          post_body = _body_param.to_body
+        else
+          post_body = _body_param
+        end
+      end
+    end{{/bodyParam}}
+
+{{#returnType}}
+    response = Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
+    {{#returnContainer}}response.map {|response| {{/returnContainer}}{{returnBaseType}}.new(response){{#returnContainer}} }{{/returnContainer}}{{/returnType}}{{^returnType}}    Swagger::Request.new(:{{httpMethod}}, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make{{/returnType}}
   end
-
 {{/operation}}
 end
 {{/operations}}
diff --git a/samples/client/petstore/ruby/swagger.gemspec b/modules/swagger-codegen/src/main/resources/ruby/swagger-client.gemspec.mustache
similarity index 90%
rename from samples/client/petstore/ruby/swagger.gemspec
rename to modules/swagger-codegen/src/main/resources/ruby/swagger-client.gemspec.mustache
index 61bab334b3b..c002e581b8b 100644
--- a/samples/client/petstore/ruby/swagger.gemspec
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger-client.gemspec.mustache
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "swagger/version"
 
 Gem::Specification.new do |s|
-  s.name        = "swagger"
+  s.name        = "{{artifactId}}"
   s.version     = Swagger::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Zeke Sikelianos", "Tony Tam"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{A ruby wrapper for the swagger APIs}
   s.description = %q{This gem maps to a swagger API}
 
-  s.rubyforge_project = "swagger"
+  s.rubyforge_project = "{{artifactId}}"
 
   s.add_dependency 'typhoeus', '>=0.2.1'
   s.add_dependency 'addressable', '>=2.2.4'
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>=2.5.0'
   s.add_development_dependency 'vcr', '>=1.5.1'
   s.add_development_dependency 'webmock', '>=1.6.2'
-  s.add_development_dependency 'autotest'  
+  s.add_development_dependency 'autotest'
   s.add_development_dependency 'autotest-rails-pure'
   s.add_development_dependency 'autotest-growl'
   s.add_development_dependency 'autotest-fsevent'
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger-client.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger-client.mustache
new file mode 100644
index 00000000000..b13f83b1dbc
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger-client.mustache
@@ -0,0 +1,5 @@
+require 'monkey'
+require 'swagger'
+
+Dir[File.join(File.dirname(__FILE__), "../lib/*.rb")].each {|file| require file if file !~ /swagger-client\.rb\z/ }
+Dir[File.join(File.dirname(__FILE__), "../models/*.rb")].each {|file| require file }
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache
index 1cc3ea456c2..fff098e96fc 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger.mustache
@@ -7,6 +7,8 @@ require 'logger'
 
 module Swagger
     
+  @configuration = Configuration.new
+
   class << self
     attr_accessor :logger
     
@@ -27,7 +29,6 @@ module Swagger
     #   end
     #
     def configure
-      self.configuration ||= Configuration.new
       yield(configuration) if block_given?
 
       # Configure logger.  Default to use Rails
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache
index 1cf6e0dfa0e..d27109aa445 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/configuration.mustache
@@ -8,11 +8,11 @@ module Swagger
     # Defaults go in here..
     def initialize
       @format = 'json'
-      @scheme = 'http'
-      @host = 'api.wordnik.com'
-      @base_path = '/v4'
+      @scheme = '{{scheme}}'
+      @host = '{{host}}'
+      @base_path = '{{contextPath}}'
       @user_agent = "ruby-swagger-#{Swagger::VERSION}"
-      @inject_format = true
+      @inject_format = false
       @force_ending_format = false
       @camelize_params = true
     end
diff --git a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
index 34401827982..fbd70eeb9f5 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
@@ -74,11 +74,6 @@ module Swagger
     def interpreted_path
       p = self.path.dup
 
-      # Fill in the path params
-      self.params.each_pair do |key, value|
-        p = p.gsub("{#{key}}", value.to_s)
-      end
-
       # Stick a .{format} placeholder into the path if there isn't
       # one already or an actual format like json or xml
       # e.g. /words/blah => /words.{format}/blah
@@ -157,8 +152,9 @@ module Swagger
     end
   
     def make
-      logger = Logger.new STDOUT
-      logger.debug self.url
+      #TODO use configuration setting to determine if debugging
+      #logger = Logger.new STDOUT
+      #logger.debug self.url
       response = case self.http_method.to_sym
       when :get,:GET
         Typhoeus::Request.get(
diff --git a/modules/swagger-codegen/src/main/resources/scala/api.mustache b/modules/swagger-codegen/src/main/resources/scala/api.mustache
index 1de17ce60f5..0610123ce8b 100644
--- a/modules/swagger-codegen/src/main/resources/scala/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/api.mustache
@@ -19,6 +19,12 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
   {{#operation}}
+  /**
+   * {{summary}}
+   * {{notes}}
+{{#allParams}}   * @param {{paramName}} {{description}}
+{{/allParams}}   * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
+   */
   def {{nickname}} ({{#allParams}}{{paramName}}: {{dataType}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {{#returnType}}: Option[{{returnType}}]{{/returnType}} = {
     // create path and map variables
     val path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{baseName}}" + "\\}",apiInvoker.escape({{paramName}}))
@@ -66,4 +72,4 @@ class {{classname}}(val defBasePath: String = "{{basePath}}",
   }
   {{/operation}}
 }
-{{/operations}}
\ No newline at end of file
+{{/operations}}
diff --git a/modules/swagger-codegen/src/test/scala/CodegenTest.scala b/modules/swagger-codegen/src/test/scala/CodegenTest.scala
index 3c31c87b25d..9e2a1d9fa9e 100644
--- a/modules/swagger-codegen/src/test/scala/CodegenTest.scala
+++ b/modules/swagger-codegen/src/test/scala/CodegenTest.scala
@@ -40,7 +40,7 @@ class CodegenTest extends FlatSpec with Matchers {
     val file = formParams.get(1)
     file.isFormParam should equal (true)
     file.dataType should be ("file")
-    file.required should equal (false)
+    file.required should equal (null)
     file.isFile should equal (true)
     file.hasMore should be (null)
   }
@@ -84,14 +84,14 @@ class CodegenTest extends FlatSpec with Matchers {
     nameParam.isFormParam should equal (true)
     nameParam.notFile should equal (true)
     nameParam.dataType should be ("String")
-    nameParam.required should equal (false)
+    nameParam.required should equal (null)
     nameParam.hasMore should equal (true)
 
     val statusParam = formParams.get(1)
     statusParam.isFormParam should equal (true)
     statusParam.notFile should equal (true)
     statusParam.dataType should be ("String")
-    statusParam.required should equal (false)    
+    statusParam.required should equal (null)    
     statusParam.hasMore should be (null)    
   }
 
diff --git a/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala b/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
index a5d30bc6804..f5b26bf78e8 100644
--- a/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
+++ b/modules/swagger-codegen/src/test/scala/Java/JavaModelTest.scala
@@ -62,7 +62,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(2).defaultValue should be ("null")
     vars.get(2).baseType should be ("Date")
     vars.get(2).hasMore should equal (null)
-    vars.get(2).required should equal (false)
+    vars.get(2).required should equal (null)
     vars.get(2).isNotContainer should equal (true)
   }
 
@@ -91,7 +91,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(1).defaultValue should be ("new ArrayList<String>() ")
     vars.get(1).baseType should be ("List")
     vars.get(1).containerType should be ("array")
-    vars.get(1).required should equal (false)
+    vars.get(1).required should equal (null)
     vars.get(1).isContainer should equal (true)
   }
 
@@ -119,7 +119,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).defaultValue should be ("new HashMap<String, String>() ")
     vars.get(0).baseType should be ("Map")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
   }
 
@@ -150,7 +150,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).defaultValue should be ("new HashMap<String, List<Pet>>() ")
     vars.get(0).baseType should be ("Map")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
   }
 
@@ -175,7 +175,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).name should be ("children")
     vars.get(0).defaultValue should be ("null")
     vars.get(0).baseType should be ("Children")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isNotContainer should equal (true)
   }
 
@@ -203,7 +203,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).defaultValue should be ("new ArrayList<Children>() ")
     vars.get(0).baseType should be ("List")
     vars.get(0).containerType should be ("array")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
   }
 
@@ -232,7 +232,7 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).defaultValue should be ("new HashMap<String, Children>() ")
     vars.get(0).baseType should be ("Map")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
     vars.get(0).isNotContainer should be (null)
   }
@@ -335,4 +335,15 @@ class JavaModelTest extends FlatSpec with Matchers {
     vars.get(0).setter should be ("setCreatedAt")
     vars.get(0).name should be ("createdAt")
   }
+
+  it should "properly escape names per 567" in {
+    val model = new ModelImpl()
+      .description("a sample model")
+      .property("created-at", new DateTimeProperty())
+
+    val codegen = new JavaClientCodegen()
+    val cm = codegen.fromModel("with.dots", model)
+    val vars = cm.vars
+    cm.classname should be ("WithDots")
+  }
 }
diff --git a/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala b/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala
index e0de2110ddc..6255c4deacc 100644
--- a/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala
+++ b/modules/swagger-codegen/src/test/scala/Objc/ObjcModelTest.scala
@@ -56,17 +56,14 @@ class ObjcModelTest extends FlatSpec with Matchers {
     vars.get(1).isNotContainer should equal (true)
 
     vars.get(2).baseName should be ("createdAt")
-    vars.get(2).complexType should be ("SWGDate")
-    vars.get(2).datatype should be ("SWGDate*")
+    vars.get(2).datatype should be ("NSDate*")
     vars.get(2).name should be ("createdAt")
     vars.get(2).defaultValue should be (null)
-    vars.get(2).baseType should be ("SWGDate")
+    vars.get(2).baseType should be ("NSDate")
     vars.get(2).hasMore should equal (null)
-    vars.get(2).required should equal (false)
+    vars.get(2).required should equal (null)
     vars.get(2).isNotContainer should equal (true)
 
-    (cm.imports.asScala.toSet &
-      Set("SWGDate")).size should be (1)
   }
 
   it should "convert a model with list property" in {
@@ -103,7 +100,7 @@ class ObjcModelTest extends FlatSpec with Matchers {
     vars.get(1).baseType should be ("NSArray")
     vars.get(1).hasMore should be (null)
     vars.get(1).containerType should equal ("array")
-    vars.get(1).required should equal (false)
+    vars.get(1).required should equal (null)
     vars.get(1).isPrimitiveType should equal (true)
     vars.get(1).isContainer should equal (true)
   }
@@ -129,7 +126,7 @@ class ObjcModelTest extends FlatSpec with Matchers {
     vars.get(0).name should be ("translations")
     vars.get(0).baseType should be ("NSDictionary")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
     vars.get(0).isPrimitiveType should equal (true)
   }
@@ -152,7 +149,7 @@ class ObjcModelTest extends FlatSpec with Matchers {
     vars.get(0).datatype should be ("SWGChildren*")
     vars.get(0).name should be ("children")
     vars.get(0).baseType should be ("SWGChildren")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isNotContainer should equal (true)
   }
 
@@ -173,11 +170,11 @@ class ObjcModelTest extends FlatSpec with Matchers {
     val vars = cm.vars
     vars.get(0).baseName should be ("children")
     vars.get(0).complexType should be ("SWGChildren")
-    vars.get(0).datatype should be ("NSArray*")
+    vars.get(0).datatype should be ("NSArray<SWGChildren>*")
     vars.get(0).name should be ("children")
     vars.get(0).baseType should be ("NSArray")
     vars.get(0).containerType should be ("array")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
   }
 
@@ -203,7 +200,7 @@ class ObjcModelTest extends FlatSpec with Matchers {
     vars.get(0).name should be ("children")
     vars.get(0).baseType should be ("NSDictionary")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
     vars.get(0).isNotContainer should be (null)
   }
@@ -259,4 +256,4 @@ class ObjcModelTest extends FlatSpec with Matchers {
     insectCo.imports.size should be (1)
     insectCo.imports.contains("SWGInsect") should equal (true)
   }
-}
\ No newline at end of file
+}
diff --git a/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala b/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala
index 8051e84e660..b05059a218a 100644
--- a/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala
+++ b/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala
@@ -1,6 +1,8 @@
 import com.wordnik.swagger.models._
 import io.swagger.parser._
 
+import com.wordnik.swagger.util.Json
+
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
@@ -14,6 +16,7 @@ class SwaggerMigratorTest extends FlatSpec with Matchers {
 
   it should "read a 1.2 spec" in {
     val loader = new SwaggerParser()
-    loader.read("src/test/resources/1_2/petstore-1.2/api-docs")
+    val swagger = loader.read("src/test/resources/1_2/petstore-1.2/api-docs")
+    Json.prettyPrint(swagger)
   }
 }
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala b/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala
index c3acaf15227..ffb1e59c85d 100644
--- a/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala
+++ b/modules/swagger-codegen/src/test/scala/php/PhpModelTest.scala
@@ -62,7 +62,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     vars.get(2).defaultValue should be ("null")
     vars.get(2).baseType should be ("DateTime")
     vars.get(2).hasMore should equal (null)
-    vars.get(2).required should equal (false)
+    vars.get(2).required should equal (null)
     vars.get(2).isNotContainer should equal (true)
 
     cm.imports.size() should be (0)
@@ -101,7 +101,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     vars.get(1).baseType should be ("array")
     vars.get(1).hasMore should be (null)
     vars.get(1).containerType should equal ("array")
-    vars.get(1).required should equal (false)
+    vars.get(1).required should equal (null)
     vars.get(1).isPrimitiveType should equal (true)
     vars.get(1).isContainer should equal (true)
   }
@@ -127,7 +127,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     vars.get(0).name should be ("translations")
     vars.get(0).baseType should be ("map")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
     vars.get(0).isPrimitiveType should equal (true)
   }
@@ -150,7 +150,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     vars.get(0).datatype should be ("Children")
     vars.get(0).name should be ("children")
     vars.get(0).baseType should be ("Children")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isNotContainer should equal (true)
   }
 
@@ -175,7 +175,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     vars.get(0).name should be ("children")
     vars.get(0).baseType should be ("array")
     vars.get(0).containerType should be ("array")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
   }
 
@@ -201,7 +201,7 @@ class PhpModelTest extends FlatSpec with Matchers {
     vars.get(0).name should be ("children")
     vars.get(0).baseType should be ("map")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
     vars.get(0).isNotContainer should be (null)
   }
diff --git a/modules/swagger-codegen/src/test/scala/scala/ScalaModelTest.scala b/modules/swagger-codegen/src/test/scala/scala/ScalaModelTest.scala
index 0c71983b1d5..090e4cd5ffe 100644
--- a/modules/swagger-codegen/src/test/scala/scala/ScalaModelTest.scala
+++ b/modules/swagger-codegen/src/test/scala/scala/ScalaModelTest.scala
@@ -63,7 +63,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
     vars.get(2).defaultValue should be ("null")
     vars.get(2).baseType should be ("DateTime")
     vars.get(2).hasMore should equal (null)
-    vars.get(2).required should equal (false)
+    vars.get(2).required should equal (null)
     vars.get(2).isNotContainer should equal (true)
   }
 
@@ -91,7 +91,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
     vars.get(1).defaultValue should be ("new ListBuffer[String]() ")
     vars.get(1).baseType should be ("List")
     vars.get(1).containerType should be ("array")
-    vars.get(1).required should equal (false)
+    vars.get(1).required should equal (null)
     vars.get(1).isContainer should equal (true)
   }
 
@@ -119,7 +119,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
     vars.get(0).defaultValue should be ("new HashMap[String, String]() ")
     vars.get(0).baseType should be ("Map")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
   }
 
@@ -144,7 +144,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
     vars.get(0).name should be ("children")
     vars.get(0).defaultValue should be ("null")
     vars.get(0).baseType should be ("Children")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isNotContainer should equal (true)
   }
 
@@ -172,7 +172,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
     vars.get(0).defaultValue should be ("new ListBuffer[Children]() ")
     vars.get(0).baseType should be ("List")
     vars.get(0).containerType should be ("array")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
   }
 
@@ -201,7 +201,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
     vars.get(0).defaultValue should be ("new HashMap[String, Children]() ")
     vars.get(0).baseType should be ("Map")
     vars.get(0).containerType should be ("map")
-    vars.get(0).required should equal (false)
+    vars.get(0).required should equal (null)
     vars.get(0).isContainer should equal (true)
     vars.get(0).isNotContainer should be (null)
   }
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
index c9a9eb8d56c..23187d581dd 100644
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@@ -3,16 +3,24 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-codegen-project</artifactId>
-    <version>2.1.3-M1-SNAPSHOT</version>
+    <version>2.1.1-M2-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-generator</artifactId>
   <packaging>war</packaging>
   <name>swagger-generator</name>
-  <version>2.1.3-M1-SNAPSHOT</version>
+  <version>2.1.1-M2-SNAPSHOT</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>logback.xml</exclude>
+        </excludes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -95,7 +103,7 @@
           <stopPort>8079</stopPort>
           <stopKey>stopit</stopKey>
           <httpConnector>
-            <port>8002</port>
+            <port>8001</port>
             <idleTimeout>60000</idleTimeout>
           </httpConnector>
         </configuration>
@@ -104,7 +112,7 @@
             <id>start-jetty</id>
             <phase>pre-integration-test</phase>
             <goals>
-              <goal>run</goal>
+              <goal>start</goal>
             </goals>
             <configuration>
               <scanIntervalSeconds>0</scanIntervalSeconds>
@@ -226,7 +234,7 @@
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <servlet-api-version>2.5</servlet-api-version>
     <zip-version>1.3.2</zip-version>
-    <jetty-version>9.0.7.v20131107</jetty-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.4.1</jersey2-version>
   </properties>
 </project>
diff --git a/modules/swagger-generator/src/test/scala/GeneratorInputTest.scala b/modules/swagger-generator/src/test/scala/GeneratorInputTest.scala
index b417ce322b6..ac695bbf9d6 100644
--- a/modules/swagger-generator/src/test/scala/GeneratorInputTest.scala
+++ b/modules/swagger-generator/src/test/scala/GeneratorInputTest.scala
@@ -14,6 +14,5 @@ class GeneratorInputTest extends FlatSpec with Matchers {
   it should "write an object" in {
     val obj = new GeneratorInput()
     obj.setSwaggerUrl("http://petstore.swagger.io/v2/swagger.json")
-    Json.prettyPrint(obj)
   }
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7e8e7b9ddcd..fd7d05b546a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <artifactId>swagger-codegen-project</artifactId>
   <packaging>pom</packaging>
   <name>swagger-codegen-project</name>
-  <version>2.1.3-M1-SNAPSHOT</version>
+  <version>2.1.1-M2-SNAPSHOT</version>
   <url>https://github.com/swagger-api/swagger-codegen</url>
   <scm>
     <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
@@ -277,8 +277,80 @@
         </plugins>
       </build>
     </profile>
+    <!-- Samples -->
+    <profile>
+      <id>android-client</id>
+      <activation>
+        <property>
+          <name>env</name>
+          <value>java</value>
+        </property>
+      </activation>
+      <modules>
+        <module>samples/client/petstore/android-java</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>java-client</id>
+      <activation>
+        <property>
+          <name>env</name>
+          <value>java</value>
+        </property>
+      </activation>
+      <modules>
+        <module>samples/client/petstore/java</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>objc-client</id>
+      <activation>
+        <property>
+          <name>env</name>
+          <value>objc</value>
+        </property>
+      </activation>
+      <modules>
+        <module>samples/client/petstore/objc</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>jaxrs-server</id>
+      <activation>
+        <property>
+          <name>env</name>
+          <value>java</value>
+        </property>
+      </activation>
+      <modules>
+        <module>samples/server/petstore/jaxrs</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>ruby-client</id>
+      <activation>
+        <property>
+          <name>env</name>
+          <value>java</value>
+        </property>
+      </activation>
+      <modules>
+        <module>samples/client/petstore/ruby</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>spring-mvc</id>
+      <activation>
+        <property>
+          <name>env</name>
+          <value>java</value>
+        </property>
+      </activation>
+      <modules>
+        <module>samples/server/petstore/spring-mvc</module>
+      </modules>
+    </profile>
     <profile>
-      <!-- Samples -->
       <id>samples</id>
       <activation>
         <property>
@@ -287,7 +359,12 @@
         </property>
       </activation>
       <modules>
+        <module>samples/client/petstore/android-java</module>
+        <module>samples/client/petstore/java</module>
+        <module>samples/server/petstore/jaxrs</module>
+        <module>samples/server/petstore/spring-mvc</module>
         <module>samples/client/petstore/objc</module>
+        <module>samples/client/petstore/ruby</module>
       </modules>
     </profile>
   </profiles>
@@ -360,10 +437,10 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-parser-version>1.0.3</swagger-parser-version>
-    <scala-version>2.11.1</scala-version>
+    <swagger-parser-version>1.0.6-SNAPSHOT</swagger-parser-version>
+    <scala-version>2.10.4</scala-version>
     <felix-version>2.3.4</felix-version>
-    <swagger-core-version>1.5.3-M1-SNAPSHOT</swagger-core-version>
+    <swagger-core-version>1.5.1-M2</swagger-core-version>
     <scala-test-version>2.1.4</scala-test-version>
     <commons-io-version>2.3</commons-io-version>
     <commons-cli-version>1.2</commons-cli-version>
@@ -372,7 +449,6 @@
     <commons-lang-version>2.4</commons-lang-version>
     <slf4j-version>1.6.3</slf4j-version>
     <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
-    <scala-version>2.10.4</scala-version>
     <jmustache-version>1.9</jmustache-version>
   </properties>
 </project>
diff --git a/samples/client/petstore/android-java/build.gradle b/samples/client/petstore/android-java/build.gradle
new file mode 100644
index 00000000000..dfe5e1725d4
--- /dev/null
+++ b/samples/client/petstore/android-java/build.gradle
@@ -0,0 +1,55 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.2'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion '22.0.0'
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 22
+    }
+}
+
+ext {
+    swagger_annotations_version = "1.5.3-M1"
+    jackson_version = "2.5.2"
+    httpclient_version = "4.3.3"
+    junit_version = "4.8.1"
+}
+
+dependencies {
+    compile "com.wordnik:swagger-annotations:$swagger_annotations_version"
+    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "org.apache.httpcomponents:httpcore:$httpclient_version"
+    compile "org.apache.httpcomponents:httpclient:$httpclient_version"
+    compile "org.apache.httpcomponents:httpmime:$httpclient_version"
+    testCompile "junit:junit:$junit_version"
+}
+
+afterEvaluate {
+    android.libraryVariants.all { variant ->
+        def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
+        task.description = "Create jar artifact for ${variant.name}"
+        task.dependsOn variant.javaCompile
+        task.from variant.javaCompile.destinationDir
+        task.destinationDir = project.file("${project.buildDir}/outputs/jar")
+        task.archiveName = "${project.name}-${variant.baseName}.jar"
+        artifacts.add('archives', task);
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/android-java/pom.xml b/samples/client/petstore/android-java/pom.xml
deleted file mode 100644
index 003a4450b5b..00000000000
--- a/samples/client/petstore/android-java/pom.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.swagger</groupId>
-  <artifactId>swagger-client</artifactId>
-  <packaging>jar</packaging>
-  <name>swagger-client</name>
-  <version>1.0.0</version>
-  <scm>
-    <connection>scm:git:git@github.com:wordnik/swagger-mustache.git</connection>
-    <developerConnection>scm:git:git@github.com:wordnik/swagger-codegen.git</developerConnection>
-    <url>https://github.com/wordnik/swagger-codegen</url>
-  </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>loggerPath</name>
-              <value>conf/log4j.properties</value>
-            </property>
-          </systemProperties>
-          <argLine>-Xms512m -Xmx1500m</argLine>
-          <parallel>methods</parallel>
-          <forkMode>pertest</forkMode>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- attach test jar -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add_sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/main/java</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add_test_sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/test/java</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.wordnik</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-annotations-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>${jackson-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>${jackson-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>${jackson-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpclient-version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <version>${httpclient-version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit-version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <repositories>
-    <repository>
-      <id>sonatype-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </repository>
-  </repositories>
-  <properties>
-    <swagger-annotations-version>1.5.1-M1</swagger-annotations-version>
-    <jackson-version>2.1.4</jackson-version>
-    <junit-version>4.8.1</junit-version>
-    <maven-plugin-version>1.0.0</maven-plugin-version>
-    <junit-version>4.8.1</junit-version>
-    <httpclient-version>4.3.6</httpclient-version>
-  </properties>
-</project>
diff --git a/samples/client/petstore/android-java/src/main/AndroidManifest.xml b/samples/client/petstore/android-java/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..3042699fd86
--- /dev/null
+++ b/samples/client/petstore/android-java/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest package="io.swagger.client">
+    <application />
+</manifest>
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
index 9eb217fe736..dec0db43f66 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -16,6 +16,7 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.*;
 import org.apache.http.impl.conn.*;
+import org.apache.http.impl.conn.tsccm.*;
 import org.apache.http.params.*;
 import org.apache.http.util.EntityUtils;
 
@@ -24,6 +25,7 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import java.net.URLEncoder;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -70,7 +72,7 @@ public class ApiInvoker {
    * ISO 8601 date time format.
    * @see https://en.wikipedia.org/wiki/ISO_8601
    */
-  public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+  public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
 
   /**
    * ISO 8601 date format.
@@ -82,6 +84,13 @@ public class ApiInvoker {
     // Use UTC as the default time zone.
     DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
     DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    // Set default User-Agent.
+    setUserAgent("Android-Java-Swagger");
+  }
+
+  public static void setUserAgent(String userAgent) {
+    INSTANCE.addDefaultHeader("User-Agent", userAgent);
   }
 
   public static Date parseDateTime(String str) {
@@ -113,6 +122,15 @@ public class ApiInvoker {
       return "";
     } else if (param instanceof Date) {
       return formatDateTime((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
     } else {
       return String.valueOf(param);
     }
@@ -140,7 +158,7 @@ public class ApiInvoker {
 
   public static Object deserialize(String json, String containerType, Class cls) throws ApiException {
     try{
-      if("List".equals(containerType)) {
+      if("list".equalsIgnoreCase(containerType) || "array".equalsIgnoreCase(containerType)) {
         JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
         List response = (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
         return response;
@@ -300,6 +318,7 @@ public class ApiInvoker {
           HttpEntity resEntity = response.getEntity();
           responseString = EntityUtils.toString(resEntity);
         }
+        return responseString;
       }
       else {
         if(response.getEntity() != null) {
@@ -308,9 +327,8 @@ public class ApiInvoker {
         }
         else
           responseString = "no data";
-        throw new ApiException(code, responseString);
       }
-      return responseString;
+      throw new ApiException(code, responseString);
     }
     catch(IOException e) {
       throw new ApiException(500, e.getMessage());
@@ -364,7 +382,7 @@ public class ApiInvoker {
       schemeRegistry.register(httpsScheme);
       schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
 
-      ignoreSSLConnectionManager = new SingleClientConnManager(new BasicHttpParams(), schemeRegistry);
+      ignoreSSLConnectionManager = new ThreadSafeClientConnManager(new BasicHttpParams(), schemeRegistry);
     } catch (NoSuchAlgorithmException e) {
       // This will only be thrown if SSL isn't available for some reason.
     } catch (KeyManagementException e) {
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
index 41e1427b3cd..c8da678b2f9 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
@@ -38,7 +38,12 @@ public class PetApi {
   }
 
   
-  
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store
+   * @return void
+   */
   public void  updatePet (Pet body) throws ApiException {
     Object postBody = body;
 
@@ -59,7 +64,7 @@ public class PetApi {
     
 
     String[] contentTypes = {
-      "application/json","application/xml"
+      "application/json","application/xml",
     };
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
@@ -84,16 +89,16 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store
+   * @return void
+   */
   public void  addPet (Pet body) throws ApiException {
     Object postBody = body;
 
@@ -114,7 +119,7 @@ public class PetApi {
     
 
     String[] contentTypes = {
-      "application/json","application/xml"
+      "application/json","application/xml",
     };
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
@@ -139,16 +144,16 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma seperated strings
+   * @param status Status values that need to be considered for filter
+   * @return List<Pet>
+   */
   public List<Pet>  findPetsByStatus (List<String> status) throws ApiException {
     Object postBody = null;
 
@@ -196,16 +201,16 @@ public class PetApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by
+   * @return List<Pet>
+   */
   public List<Pet>  findPetsByTags (List<String> tags) throws ApiException {
     Object postBody = null;
 
@@ -253,16 +258,16 @@ public class PetApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return Pet
+   */
   public Pet  getPetById (Long petId) throws ApiException {
     Object postBody = null;
 
@@ -308,16 +313,18 @@ public class PetApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated
+   * @param name Updated name of the pet
+   * @param status Updated status of the pet
+   * @return void
+   */
   public void  updatePetWithForm (String petId, String name, String status) throws ApiException {
     Object postBody = null;
 
@@ -338,7 +345,7 @@ public class PetApi {
     
 
     String[] contentTypes = {
-      "application/x-www-form-urlencoded"
+      "application/x-www-form-urlencoded",
     };
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
@@ -373,16 +380,17 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Deletes a pet
+   * 
+   * @param apiKey 
+   * @param petId Pet id to delete
+   * @return void
+   */
   public void  deletePet (String apiKey, Long petId) throws ApiException {
     Object postBody = null;
 
@@ -429,16 +437,18 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update
+   * @param additionalMetadata Additional data to pass to server
+   * @param file file to upload
+   * @return void
+   */
   public void  uploadFile (Long petId, String additionalMetadata, File file) throws ApiException {
     Object postBody = null;
 
@@ -459,7 +469,7 @@ public class PetApi {
     
 
     String[] contentTypes = {
-      "multipart/form-data"
+      "multipart/form-data",
     };
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
 
@@ -494,12 +504,7 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
index b68af58ce9d..1e2ff3bba8a 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
@@ -38,7 +38,11 @@ public class StoreApi {
   }
 
   
-  
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map<String, Integer>
+   */
   public Map<String, Integer>  getInventory () throws ApiException {
     Object postBody = null;
 
@@ -84,16 +88,16 @@ public class StoreApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet
+   * @return Order
+   */
   public Order  placeOrder (Order body) throws ApiException {
     Object postBody = body;
 
@@ -139,16 +143,16 @@ public class StoreApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched
+   * @return Order
+   */
   public Order  getOrderById (String orderId) throws ApiException {
     Object postBody = null;
 
@@ -194,16 +198,16 @@ public class StoreApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted
+   * @return void
+   */
   public void  deleteOrder (String orderId) throws ApiException {
     Object postBody = null;
 
@@ -249,12 +253,7 @@ public class StoreApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
index aea620104a9..da105638c5f 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
@@ -38,7 +38,12 @@ public class UserApi {
   }
 
   
-  
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object
+   * @return void
+   */
   public void  createUser (User body) throws ApiException {
     Object postBody = body;
 
@@ -84,16 +89,16 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
   public void  createUsersWithArrayInput (List<User> body) throws ApiException {
     Object postBody = body;
 
@@ -139,16 +144,16 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
   public void  createUsersWithListInput (List<User> body) throws ApiException {
     Object postBody = body;
 
@@ -194,16 +199,17 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login
+   * @param password The password for login in clear text
+   * @return String
+   */
   public String  loginUser (String username, String password) throws ApiException {
     Object postBody = null;
 
@@ -253,16 +259,15 @@ public class UserApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Logs out current logged in user session
+   * 
+   * @return void
+   */
   public void  logoutUser () throws ApiException {
     Object postBody = null;
 
@@ -308,16 +313,16 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. 
+   * @return User
+   */
   public User  getUserByName (String username) throws ApiException {
     Object postBody = null;
 
@@ -363,16 +368,17 @@ public class UserApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted
+   * @param body Updated user object
+   * @return void
+   */
   public void  updateUser (String username, User body) throws ApiException {
     Object postBody = body;
 
@@ -418,16 +424,16 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-  
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted
+   * @return void
+   */
   public void  deleteUser (String username) throws ApiException {
     Object postBody = null;
 
@@ -473,12 +479,7 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-        return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
index 3a7a84f89bb..ad67267a2f6 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
@@ -14,7 +14,7 @@ public class Category  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -26,7 +26,7 @@ public class Category  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
index f516f66e1fe..b9f7d1dc897 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
@@ -22,7 +22,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -34,7 +34,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("petId")
   public Long getPetId() {
     return petId;
@@ -46,7 +46,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
@@ -58,7 +58,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
   public Date getShipDate() {
     return shipDate;
@@ -71,7 +71,7 @@ public class Order  {
   /**
    * Order Status
    **/
-  @ApiModelProperty(required = false, value = "Order Status")
+  @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -83,7 +83,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
index 297e1360c70..d685a8c1cbf 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
@@ -24,7 +24,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -36,7 +36,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("category")
   public Category getCategory() {
     return category;
@@ -72,7 +72,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
@@ -85,7 +85,7 @@ public class Pet  {
   /**
    * pet status in the store
    **/
-  @ApiModelProperty(required = false, value = "pet status in the store")
+  @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
index d9bf765477b..b9dddc92f1b 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
@@ -14,7 +14,7 @@ public class Tag  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -26,7 +26,7 @@ public class Tag  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
index d82288e8c25..9811a7741f9 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
@@ -20,7 +20,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,7 +32,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("username")
   public String getUsername() {
     return username;
@@ -44,7 +44,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
@@ -56,7 +56,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
@@ -68,7 +68,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("email")
   public String getEmail() {
     return email;
@@ -80,7 +80,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("password")
   public String getPassword() {
     return password;
@@ -92,7 +92,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("phone")
   public String getPhone() {
     return phone;
@@ -105,7 +105,7 @@ public class User  {
   /**
    * User Status
    **/
-  @ApiModelProperty(required = false, value = "User Status")
+  @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java
new file mode 100644
index 00000000000..97f3b5f8006
--- /dev/null
+++ b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -0,0 +1,155 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.util.*;
+import java.io.*;
+
+import static org.junit.Assert.*;
+import org.junit.*;
+
+public class PetApiTest {
+  PetApi api = null;
+
+  @Before
+  public void setup() {
+    api = new PetApi();
+  }
+
+  @Test
+  public void testCreateAndGetPet() throws Exception {
+    Pet pet = createRandomPet();
+    api.addPet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    assertNotNull(fetched);
+    assertEquals(pet.getId(), fetched.getId());
+    assertNotNull(fetched.getCategory());
+    assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+  }
+
+  @Test
+  public void testUpdatePet() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("programmer");
+
+    api.updatePet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    assertNotNull(fetched);
+    assertEquals(pet.getId(), fetched.getId());
+    assertNotNull(fetched.getCategory());
+    assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+  }
+
+  @Test
+  public void testFindPetsByStatus() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("programmer");
+    pet.setStatus(Pet.StatusEnum.available);
+
+    api.updatePet(pet);
+
+    List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+    assertNotNull(pets);
+
+    boolean found = false;
+    for(Pet fetched : pets) {
+      if(fetched.getId().equals(pet.getId())) {
+        found = true;
+        break;
+      }
+    }
+
+    assertTrue(found);
+  }
+
+  @Test
+  public void testFindPetsByTags() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("monster");
+    pet.setStatus(Pet.StatusEnum.available);
+
+    List<Tag> tags = new ArrayList<Tag>();
+    Tag tag1 = new Tag();
+    tag1.setName("friendly");
+    tags.add(tag1);
+    pet.setTags(tags);
+
+    api.updatePet(pet);
+
+    List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
+    assertNotNull(pets);
+
+    boolean found = false;
+    for(Pet fetched : pets) {
+      if(fetched.getId().equals(pet.getId())) {
+        found = true;
+        break;
+      }
+    }
+    assertTrue(found);
+  }
+
+  @Test
+  public void testUpdatePetWithForm() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("frank");
+    api.addPet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    
+    api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
+    Pet updated = api.getPetById(fetched.getId());
+
+    assertEquals(updated.getName(), fetched.getName());
+  }
+
+  @Test
+  public void testDeletePet() throws Exception {
+    Pet pet = createRandomPet();
+    api.addPet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    api.deletePet(null, fetched.getId());
+
+    try {
+      fetched = api.getPetById(fetched.getId());
+      fail("expected an error");
+    }
+    catch (ApiException e) {
+      assertEquals(404, e.getCode());
+    }
+  }
+
+  @Test
+  public void testUploadFile() throws Exception {
+    Pet pet = createRandomPet();
+    api.addPet(pet);
+
+    File file = new File("hello.txt");
+    BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+    writer.write("Hello world!");
+    writer.close();
+
+    api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+  }
+
+  private Pet createRandomPet() {
+    Pet pet = new Pet();
+    pet.setId(System.currentTimeMillis());
+    pet.setName("gorilla");
+
+    Category category = new Category();
+    category.setName("really-happy");
+
+    pet.setCategory(category);
+    pet.setStatus(Pet.StatusEnum.available);
+    List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+    pet.setPhotoUrls(photos);
+
+    return pet;
+  }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/StoreApiTest.java
new file mode 100644
index 00000000000..25a52009b9e
--- /dev/null
+++ b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -0,0 +1,68 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.util.*;
+import java.io.*;
+
+import static org.junit.Assert.*;
+import org.junit.*;
+
+public class StoreApiTest {
+  StoreApi api = null;
+
+  @Before
+  public void setup() {
+    api = new StoreApi();
+  }
+
+  @Test
+  public void testGetInventory() throws Exception {
+    Map<String, Integer> inventory = api.getInventory();
+    assertTrue(inventory.keySet().size() > 0);
+  }
+
+  @Test
+  public void testPlaceOrder() throws Exception {
+    Order order = createOrder();
+    api.placeOrder(order);
+
+    Order fetched = api.getOrderById(String.valueOf(order.getId()));
+    assertEquals(order.getId(), fetched.getId());
+    assertEquals(order.getPetId(), fetched.getPetId());
+    assertEquals(order.getQuantity(), fetched.getQuantity());
+  }
+
+  @Test
+  public void testDeleteOrder() throws Exception {
+    Order order = createOrder();
+    api.placeOrder(order);
+
+    Order fetched = api.getOrderById(String.valueOf(order.getId()));
+    assertEquals(fetched.getId(), order.getId());
+
+    api.deleteOrder(String.valueOf(order.getId()));
+
+    try {
+      api.getOrderById(String.valueOf(order.getId()));
+      // fail("expected an error");
+    }
+    catch (ApiException e) {
+      // ok
+    }
+  }
+
+  private Order createOrder() {
+    Order order = new Order();
+    order.setId(new Long(System.currentTimeMillis()));
+    order.setPetId(new Long(200));
+    order.setQuantity(new Integer(13));
+    order.setShipDate(new java.util.Date());
+    order.setStatus(Order.StatusEnum.placed);
+    order.setComplete(true);
+
+    return order;
+  }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/UserApiTest.java
new file mode 100644
index 00000000000..9d683faab7a
--- /dev/null
+++ b/samples/client/petstore/android-java/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -0,0 +1,84 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.util.*;
+import java.io.*;
+
+import static org.junit.Assert.*;
+import org.junit.*;
+
+public class UserApiTest {
+  UserApi api = null;
+
+  @Before
+  public void setup() {
+    api = new UserApi();
+  }
+
+  @Test
+  public void testCreateUser() throws Exception {
+    User user = createUser();
+
+    api.createUser(user);
+
+    User fetched = api.getUserByName(user.getUsername());
+    assertEquals(user.getId(), fetched.getId());
+  }
+
+  @Test
+  public void testCreateUsersWithArray() throws Exception {
+    User user1 = createUser();
+    user1.setUsername("abc123");
+    User user2 = createUser();
+    user2.setUsername("123abc");
+
+    api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
+
+    User fetched = api.getUserByName(user1.getUsername());
+    assertEquals(user1.getId(), fetched.getId());
+  }
+
+  @Test
+  public void testCreateUsersWithList() throws Exception {
+    User user1 = createUser();
+    user1.setUsername("abc123");
+    User user2 = createUser();
+    user2.setUsername("123abc");
+
+    api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
+
+    User fetched = api.getUserByName(user1.getUsername());
+    assertEquals(user1.getId(), fetched.getId());
+  }
+
+  @Test
+  public void testLoginUser() throws Exception {
+    User user = createUser();
+    api.createUser(user);
+
+    String token = api.loginUser(user.getUsername(), user.getPassword());
+    assertTrue(token.startsWith("logged in user session:"));
+  }
+
+  @Test
+  public void logoutUser() throws Exception {
+    api.logoutUser();
+  }
+
+  private User createUser() {
+    User user = new User();
+    user.setId(System.currentTimeMillis());
+    user.setUsername("fred");
+    user.setFirstName("Fred");
+    user.setLastName("Meyer");
+    user.setEmail("fred@fredmeyer.com");
+    user.setPassword("xxXXxx");
+    user.setPhone("408-867-5309");
+    user.setUserStatus(123);
+
+    return user;
+  }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/async-scala/build.sbt b/samples/client/petstore/async-scala/build.sbt
index 43a13d0af07..e612d5937ea 100644
--- a/samples/client/petstore/async-scala/build.sbt
+++ b/samples/client/petstore/async-scala/build.sbt
@@ -2,10 +2,11 @@ organization := ""
 
 name := "-client"
 
-libraryDependencies += "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5"
-
-libraryDependencies += "joda-time" % "joda-time" % "2.3"
-
-libraryDependencies += "org.joda" % "joda-convert" % "1.3.1"
-
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided"
+libraryDependencies ++= Seq(
+  "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5",
+  "joda-time" % "joda-time" % "2.3",
+  "org.joda" % "joda-convert" % "1.3.1",
+  "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided",
+  "org.scalatest" %% "scalatest" % "2.2.1" % "test",
+  "junit" % "junit" % "4.11" % "test"
+)
diff --git a/samples/client/petstore/async-scala/src/test/scala/Test.scala b/samples/client/petstore/async-scala/src/test/scala/Test.scala
new file mode 100644
index 00000000000..9d716645baa
--- /dev/null
+++ b/samples/client/petstore/async-scala/src/test/scala/Test.scala
@@ -0,0 +1,40 @@
+import io.swagger.client.SwaggerClient
+import io.swagger.client.api._
+import com.wordnik.swagger.client._
+import com.wordnik.swagger.client.ClientResponseReaders.Json4sFormatsReader._
+import com.wordnik.swagger.client.RequestWriters.Json4sFormatsWriter._
+
+import org.json4s.Formats
+
+import scala.concurrent._
+import scala.concurrent.duration._
+import scala.util.{Success, Failure}
+import scala.concurrent.ExecutionContext.Implicits.global
+import java.net.URI
+
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+import org.scalatest.FlatSpec
+import org.scalatest.Matchers
+
+@RunWith(classOf[JUnitRunner])
+class SimpleTest extends FlatSpec with Matchers {
+  implicit val formats = org.json4s.DefaultFormats
+  implicit val reader = JsonFormatsReader
+  implicit val writer = JsonFormatsWriter
+
+  it should "call the api" in {
+    val config = SwaggerConfig.forUrl(new URI("http://petstore.swagger.io/v2"))
+    val client = new SwaggerClient(config)
+
+    val future = client.pet.getPetById(3)
+    val await = Await.ready(future, Duration.Inf)
+
+    await onComplete {
+      case Success(pet) => {
+        println(pet)
+      }
+      case Failure(t) => println("failed " + t.getMessage)
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/CSharpPetstoreCodegen.scala b/samples/client/petstore/csharp/CSharpPetstoreCodegen.scala
deleted file mode 100644
index 4dcab9050d8..00000000000
--- a/samples/client/petstore/csharp/CSharpPetstoreCodegen.scala
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- *  Copyright 2014 Wordnik, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-import com.wordnik.swagger.codegen.BasicCSharpGenerator
-
-object CSharpPetstoreCodegen extends BasicCSharpGenerator {
-  def main(args: Array[String]) = generateClient(args)
-
-  // location of templates
-  override def templateDir = "csharp"
-
-  // where to write generated code
-  override def destinationDir = "samples/client/petstore/csharp/src"
-
-  // package for api invoker, error files
-  override def invokerPackage = Some("Com.Wordnik.Petstore")
-
-  // package for models
-  override def modelPackage = Some("Com.Wordnik.Petstore.Model")
-
-  // package for api classes
-  override def apiPackage = Some("Com.Wordnik.Petstore.Api")
-
-  // supporting classes
-  override def supportingFiles =
-    List(
-      ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.cs"),
-      ("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.cs"),
-      ("Newtonsoft.Json.dll", "samples/client/petstore/csharp/bin", "Newtonsoft.Json.dll"),
-      ("compile.mustache", "samples/client/petstore/csharp", "compile.bat"))
-}
-
diff --git a/samples/client/petstore/csharp/bin/Com.Wordnik.Petstore.dll b/samples/client/petstore/csharp/bin/Com.Wordnik.Petstore.dll
deleted file mode 100644
index f4656a1bf40..00000000000
Binary files a/samples/client/petstore/csharp/bin/Com.Wordnik.Petstore.dll and /dev/null differ
diff --git a/samples/client/petstore/csharp/compile.bat b/samples/client/petstore/csharp/compile.bat
index c62b990f5c5..18a85febb70 100644
--- a/samples/client/petstore/csharp/compile.bat
+++ b/samples/client/petstore/csharp/compile.bat
@@ -1,2 +1,2 @@
 SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
-%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/Com.Wordnik.Petstore.dll /recurse:src\*.cs /doc:bin/Com.Wordnik.Petstore.xml
+%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
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/PetApi.cs b/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/PetApi.cs
deleted file mode 100644
index acb3abb2d66..00000000000
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/PetApi.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-  using System;
-  using System.Collections.Generic;
-  using Com.Wordnik.Petstore;
-  using Com.Wordnik.Petstore.Model;
-  namespace Com.Wordnik.Petstore.Api {
-    public class PetApi {
-      string basePath = "http://petstore.swagger.wordnik.com/api";
-      private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
-
-      public ApiInvoker getInvoker() {
-        return apiInvoker;
-      }
-      
-      // Sets the endpoint base url for the services being accessed
-      public void setBasePath(string basePath) {
-        this.basePath = basePath;
-      }
-      
-      // Gets the endpoint base url for the services being accessed
-      public String getBasePath() {
-        return basePath;
-      }
-
-      /// <summary>
-      /// Find pet by ID Returns a pet based on ID
-      /// </summary>
-      /// <param name="petId">ID of pet that needs to be fetched</param>
-      /// <returns></returns>
-      public Pet getPetById (long petId) {
-        // create path and map variables
-        var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.escapeString(petId.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (petId == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams);
-          if(response != null){
-             return (Pet) ApiInvoker.deserialize(response, typeof(Pet));
-          }
-          else {
-            return null;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return null;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Deletes a pet 
-      /// </summary>
-      /// <param name="petId">Pet id to delete</param>
-      /// <returns></returns>
-      public void deletePet (string petId) {
-        // create path and map variables
-        var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.escapeString(petId.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (petId == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// partial updates to a pet 
-      /// </summary>
-      /// <param name="petId">ID of pet that needs to be fetched</param>
-      /// <param name="body">Pet object that needs to be added to the store</param>
-      /// <returns></returns>
-      public List<Pet> partialUpdate (string petId, Pet body) {
-        // create path and map variables
-        var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.escapeString(petId.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (petId == null || body == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "PATCH", queryParams, body, headerParams);
-          if(response != null){
-             return (List<Pet>) ApiInvoker.deserialize(response, typeof(List<Pet>));
-          }
-          else {
-            return null;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return null;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Updates a pet in the store with form data 
-      /// </summary>
-      /// <param name="petId">ID of pet that needs to be updated</param>
-      /// <param name="name">Updated name of the pet</param>
-      /// <param name="status">Updated status of the pet</param>
-      /// <returns></returns>
-      public void updatePetWithForm (string petId, string name, string status) {
-        // create path and map variables
-        var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.escapeString(petId.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (petId == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, null, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// uploads an image 
-      /// </summary>
-      /// <param name="additionalMetadata">Additional data to pass to server</param>
-      /// <param name="body">file to upload</param>
-      /// <returns></returns>
-      public void uploadFile (string additionalMetadata, File body) {
-        // create path and map variables
-        var path = "/pet/uploadImage".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, body, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Add a new pet to the store 
-      /// </summary>
-      /// <param name="body">Pet object that needs to be added to the store</param>
-      /// <returns></returns>
-      public void addPet (Pet body) {
-        // create path and map variables
-        var path = "/pet".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (body == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, body, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Update an existing pet 
-      /// </summary>
-      /// <param name="body">Pet object that needs to be updated in the store</param>
-      /// <returns></returns>
-      public void updatePet (Pet body) {
-        // create path and map variables
-        var path = "/pet".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (body == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, body, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Finds Pets by status Multiple status values can be provided with comma seperated strings
-      /// </summary>
-      /// <param name="status">Status values that need to be considered for filter</param>
-      /// <returns></returns>
-      public List<Pet> findPetsByStatus (string status) {
-        // create path and map variables
-        var path = "/pet/findByStatus".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (status == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        if (status != null){
-          paramStr = (status != null && status is DateTime) ? ((DateTime)(object)status).ToString("u") : Convert.ToString(status);
-          queryParams.Add("status", paramStr);
-		}
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams);
-          if(response != null){
-             return (List<Pet>) ApiInvoker.deserialize(response, typeof(List<Pet>));
-          }
-          else {
-            return null;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return null;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
-      /// </summary>
-      /// <param name="tags">Tags to filter by</param>
-      /// <returns></returns>
-      public List<Pet> findPetsByTags (string tags) {
-        // create path and map variables
-        var path = "/pet/findByTags".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (tags == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        if (tags != null){
-          paramStr = (tags != null && tags is DateTime) ? ((DateTime)(object)tags).ToString("u") : Convert.ToString(tags);
-          queryParams.Add("tags", paramStr);
-		}
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams);
-          if(response != null){
-             return (List<Pet>) ApiInvoker.deserialize(response, typeof(List<Pet>));
-          }
-          else {
-            return null;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return null;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      }
-    }
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/StoreApi.cs b/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/StoreApi.cs
deleted file mode 100644
index 22c36a411ca..00000000000
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/StoreApi.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-  using System;
-  using System.Collections.Generic;
-  using Com.Wordnik.Petstore;
-  using Com.Wordnik.Petstore.Model;
-  namespace Com.Wordnik.Petstore.Api {
-    public class StoreApi {
-      string basePath = "http://petstore.swagger.wordnik.com/api";
-      private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
-
-      public ApiInvoker getInvoker() {
-        return apiInvoker;
-      }
-      
-      // Sets the endpoint base url for the services being accessed
-      public void setBasePath(string basePath) {
-        this.basePath = basePath;
-      }
-      
-      // Gets the endpoint base url for the services being accessed
-      public String getBasePath() {
-        return basePath;
-      }
-
-      /// <summary>
-      /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5. Anything above 5 or nonintegers will generate API errors
-      /// </summary>
-      /// <param name="orderId">ID of pet that needs to be fetched</param>
-      /// <returns></returns>
-      public Order getOrderById (string orderId) {
-        // create path and map variables
-        var path = "/store/order/{orderId}".Replace("{format}","json").Replace("{" + "orderId" + "}", apiInvoker.escapeString(orderId.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (orderId == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams);
-          if(response != null){
-             return (Order) ApiInvoker.deserialize(response, typeof(Order));
-          }
-          else {
-            return null;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return null;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000.  Anything above 1000 or nonintegers will generate API errors
-      /// </summary>
-      /// <param name="orderId">ID of the order that needs to be deleted</param>
-      /// <returns></returns>
-      public void deleteOrder (string orderId) {
-        // create path and map variables
-        var path = "/store/order/{orderId}".Replace("{format}","json").Replace("{" + "orderId" + "}", apiInvoker.escapeString(orderId.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (orderId == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Place an order for a pet 
-      /// </summary>
-      /// <param name="body">order placed for purchasing the pet</param>
-      /// <returns></returns>
-      public void placeOrder (Order body) {
-        // create path and map variables
-        var path = "/store/order".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (body == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, body, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      }
-    }
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/UserApi.cs b/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/UserApi.cs
deleted file mode 100644
index 23a58501579..00000000000
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Api/UserApi.cs
+++ /dev/null
@@ -1,310 +0,0 @@
-  using System;
-  using System.Collections.Generic;
-  using Com.Wordnik.Petstore;
-  using Com.Wordnik.Petstore.Model;
-  namespace Com.Wordnik.Petstore.Api {
-    public class UserApi {
-      string basePath = "http://petstore.swagger.wordnik.com/api";
-      private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
-
-      public ApiInvoker getInvoker() {
-        return apiInvoker;
-      }
-      
-      // Sets the endpoint base url for the services being accessed
-      public void setBasePath(string basePath) {
-        this.basePath = basePath;
-      }
-      
-      // Gets the endpoint base url for the services being accessed
-      public String getBasePath() {
-        return basePath;
-      }
-
-      /// <summary>
-      /// Updated user This can only be done by the logged in user.
-      /// </summary>
-      /// <param name="username">name that need to be deleted</param>
-      /// <param name="body">Updated user object</param>
-      /// <returns></returns>
-      public void updateUser (string username, User body) {
-        // create path and map variables
-        var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.escapeString(username.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (username == null || body == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, body, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Delete user This can only be done by the logged in user.
-      /// </summary>
-      /// <param name="username">The name that needs to be deleted</param>
-      /// <returns></returns>
-      public void deleteUser (string username) {
-        // create path and map variables
-        var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.escapeString(username.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (username == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Get user by user name 
-      /// </summary>
-      /// <param name="username">The name that needs to be fetched. Use user1 for testing.</param>
-      /// <returns></returns>
-      public User getUserByName (string username) {
-        // create path and map variables
-        var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.escapeString(username.ToString()));
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (username == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams);
-          if(response != null){
-             return (User) ApiInvoker.deserialize(response, typeof(User));
-          }
-          else {
-            return null;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return null;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Logs user into the system 
-      /// </summary>
-      /// <param name="username">The user name for login</param>
-      /// <param name="password">The password for login in clear text</param>
-      /// <returns></returns>
-      public string loginUser (string username, string password) {
-        // create path and map variables
-        var path = "/user/login".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (username == null || password == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        if (username != null){
-          paramStr = (username != null && username is DateTime) ? ((DateTime)(object)username).ToString("u") : Convert.ToString(username);
-          queryParams.Add("username", paramStr);
-		}
-        if (password != null){
-          paramStr = (password != null && password is DateTime) ? ((DateTime)(object)password).ToString("u") : Convert.ToString(password);
-          queryParams.Add("password", paramStr);
-		}
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams);
-          if(response != null){
-             return (string) ApiInvoker.deserialize(response, typeof(string));
-          }
-          else {
-            return null;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return null;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Logs out current logged in user session 
-      /// </summary>
-      /// <returns></returns>
-      public void logoutUser () {
-        // create path and map variables
-        var path = "/user/logout".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Create user This can only be done by the logged in user.
-      /// </summary>
-      /// <param name="body">Created user object</param>
-      /// <returns></returns>
-      public void createUser (User body) {
-        // create path and map variables
-        var path = "/user".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (body == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, body, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Creates list of users with given input array 
-      /// </summary>
-      /// <param name="body">List of user object</param>
-      /// <returns></returns>
-      public void createUsersWithArrayInput (List<User> body) {
-        // create path and map variables
-        var path = "/user/createWithArray".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (body == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, body, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      /// <summary>
-      /// Creates list of users with given list input 
-      /// </summary>
-      /// <param name="body">List of user object</param>
-      /// <returns></returns>
-      public void createUsersWithListInput (List<User> body) {
-        // create path and map variables
-        var path = "/user/createWithList".Replace("{format}","json");
-
-        // query params
-        var queryParams = new Dictionary<String, String>();
-        var headerParams = new Dictionary<String, String>();
-
-        // verify required params are set
-        if (body == null ) {
-           throw new ApiException(400, "missing required params");
-        }
-        string paramStr = null;
-        try {
-          var response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, body, headerParams);
-          if(response != null){
-             return ;
-          }
-          else {
-            return ;
-          }
-        } catch (ApiException ex) {
-          if(ex.ErrorCode == 404) {
-          	return ;
-          }
-          else {
-            throw ex;
-          }
-        }
-      }
-      }
-    }
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/ApiInvoker.cs b/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/ApiInvoker.cs
deleted file mode 100644
index b61fec1687c..00000000000
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/ApiInvoker.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-  using System;
-  using System.Collections.Generic;
-  using System.IO;
-  using System.Linq;
-  using System.Net;
-  using System.Text;
-  using Newtonsoft.Json;
-
-  namespace Com.Wordnik.Petstore {
-    public class ApiInvoker {
-      private static readonly ApiInvoker _instance = new ApiInvoker();
-      private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
-
-      public static ApiInvoker GetInstance() {
-        return _instance;
-      }
-      
-      public void addDefaultHeader(string key, string value) {
-         defaultHeaderMap.Add(key, value);
-      }
-
-      public string escapeString(string str) {
-        return str;
-      }
-
-      public static object deserialize(string json, Type type) {
-        try
-        {
-            return JsonConvert.DeserializeObject(json, type);
-        }
-        catch (IOException e) {
-          throw new ApiException(500, e.Message);
-        }
-
-      }
-
-      public static string serialize(object obj) {
-        try
-        {
-            return obj != null ? JsonConvert.SerializeObject(obj) : null;
-        }
-        catch (Exception e) {
-          throw new ApiException(500, e.Message);
-        }
-      }
-
-      public string invokeAPI(string host, string path, string method, Dictionary<String, String> queryParams, object body, Dictionary<String, String> headerParams) {
-        var b = new StringBuilder();
-        
-        foreach (var queryParamItem in queryParams)
-        {
-            var value = queryParamItem.Value;
-            if (value == null) continue;
-            b.Append(b.ToString().Length == 0 ? "?" : "&");
-            b.Append(escapeString(queryParamItem.Key)).Append("=").Append(escapeString(value));
-        }
-
-        var querystring = b.ToString();
-
-          host = host.EndsWith("/") ? host.Substring(0, host.Length - 1) : host;
-
-          var client = WebRequest.Create(host + path + querystring);
-          client.ContentType = "application/json";
-          client.Method = method;
-
-          foreach (var headerParamsItem in headerParams)
-          {
-              client.Headers.Add(headerParamsItem.Key, headerParamsItem.Value);
-          }
-          foreach (var defaultHeaderMapItem in defaultHeaderMap.Where(defaultHeaderMapItem => !headerParams.ContainsKey(defaultHeaderMapItem.Key)))
-          {
-              client.Headers.Add(defaultHeaderMapItem.Key, defaultHeaderMapItem.Value);
-          }
-    
-          switch (method)
-          {
-              case "GET":
-                  break;
-              case "POST":
-              case "PUT":
-              case "DELETE":
-                  var swRequestWriter = new StreamWriter(client.GetRequestStream());
-                  swRequestWriter.Write(serialize(body));
-                  swRequestWriter.Close();
-                  break;
-              default:
-                  throw new ApiException(500, "unknown method type " + method);         
-          }
-              var webResponse = (HttpWebResponse) client.GetResponse();
-              if (webResponse.StatusCode != HttpStatusCode.OK) throw new ApiException((int) webResponse.StatusCode, webResponse.StatusDescription);
-
-              var responseReader = new StreamReader(webResponse.GetResponseStream());
-              var responseData = responseReader.ReadToEnd();
-              responseReader.Close();
-              return responseData;
-      }
-
-    }
-  }
-
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Order.cs b/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Order.cs
deleted file mode 100644
index ae5012193e7..00000000000
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Order.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Com.Wordnik.Petstore.Model {
-  public class Order {
-    public long id { get; set; }
-
-    public long petId { get; set; }
-
-    public int quantity { get; set; }
-
-    /* Order Status */
-    public string status { get; set; }
-
-    public DateTime shipDate { get; set; }
-
-    public override string ToString()  {
-      var sb = new StringBuilder();
-      sb.Append("class Order {\n");
-      sb.Append("  id: ").Append(id).Append("\n");
-      sb.Append("  petId: ").Append(petId).Append("\n");
-      sb.Append("  quantity: ").Append(quantity).Append("\n");
-      sb.Append("  status: ").Append(status).Append("\n");
-      sb.Append("  shipDate: ").Append(shipDate).Append("\n");
-      sb.Append("}\n");
-      return sb.ToString();
-    }
-  }
-  }
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Pet.cs b/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Pet.cs
deleted file mode 100644
index 8bd8f260601..00000000000
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Pet.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Com.Wordnik.Petstore.Model {
-  public class Pet {
-    /* unique identifier for the pet */
-    public long id { get; set; }
-
-    public Category category { get; set; }
-
-    public string name { get; set; }
-
-    public List<string> photoUrls { get; set; }
-
-    public List<Tag> tags { get; set; }
-
-    /* pet status in the store */
-    public string status { get; set; }
-
-    public override string ToString()  {
-      var sb = new StringBuilder();
-      sb.Append("class Pet {\n");
-      sb.Append("  id: ").Append(id).Append("\n");
-      sb.Append("  category: ").Append(category).Append("\n");
-      sb.Append("  name: ").Append(name).Append("\n");
-      sb.Append("  photoUrls: ").Append(photoUrls).Append("\n");
-      sb.Append("  tags: ").Append(tags).Append("\n");
-      sb.Append("  status: ").Append(status).Append("\n");
-      sb.Append("}\n");
-      return sb.ToString();
-    }
-  }
-  }
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/User.cs b/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/User.cs
deleted file mode 100644
index bbbd6eaccc3..00000000000
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/User.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Com.Wordnik.Petstore.Model {
-  public class User {
-    public long id { get; set; }
-
-    public string firstName { get; set; }
-
-    public string username { get; set; }
-
-    public string lastName { get; set; }
-
-    public string email { get; set; }
-
-    public string password { get; set; }
-
-    public string phone { get; set; }
-
-    /* User Status */
-    public int userStatus { get; set; }
-
-    public override string ToString()  {
-      var sb = new StringBuilder();
-      sb.Append("class User {\n");
-      sb.Append("  id: ").Append(id).Append("\n");
-      sb.Append("  firstName: ").Append(firstName).Append("\n");
-      sb.Append("  username: ").Append(username).Append("\n");
-      sb.Append("  lastName: ").Append(lastName).Append("\n");
-      sb.Append("  email: ").Append(email).Append("\n");
-      sb.Append("  password: ").Append(password).Append("\n");
-      sb.Append("  phone: ").Append(phone).Append("\n");
-      sb.Append("  userStatus: ").Append(userStatus).Append("\n");
-      sb.Append("}\n");
-      return sb.ToString();
-    }
-  }
-  }
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs
new file mode 100644
index 00000000000..4f20c0cba45
--- /dev/null
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs
@@ -0,0 +1,473 @@
+using System;
+using System.Collections.Generic;
+using io.swagger.client;
+using io.swagger.Model;
+
+namespace io.swagger.Api {
+  
+  public class PetApi {
+    string basePath;
+    private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
+
+    public PetApi(String basePath = "http://petstore.swagger.io/v2")
+    {
+      this.basePath = basePath;
+    }
+
+    public ApiInvoker getInvoker() {
+      return apiInvoker;
+    }
+
+    // Sets the endpoint base url for the services being accessed
+    public void setBasePath(string basePath) {
+      this.basePath = basePath;
+    }
+
+    // Gets the endpoint base url for the services being accessed
+    public String getBasePath() {
+      return basePath;
+    }
+
+    
+
+    /// <summary>
+    /// Update an existing pet 
+    /// </summary>
+    /// <param name="Body">Pet object that needs to be added to the store</param>
+    
+    /// <returns></returns>
+    public void  UpdatePet (Pet Body) {
+      // create path and map variables
+      var path = "/pet".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, Body, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Add a new pet to the store 
+    /// </summary>
+    /// <param name="Body">Pet object that needs to be added to the store</param>
+    
+    /// <returns></returns>
+    public void  AddPet (Pet Body) {
+      // create path and map variables
+      var path = "/pet".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "POST", queryParams, Body, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Finds Pets by status Multiple status values can be provided with comma seperated strings
+    /// </summary>
+    /// <param name="Status">Status values that need to be considered for filter</param>
+    
+    /// <returns></returns>
+    public List<Pet>  FindPetsByStatus (List<string> Status) {
+      // create path and map variables
+      var path = "/pet/findByStatus".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      if (Status != null){
+        queryParams.Add("status", apiInvoker.ParameterToString(Status));
+      }
+      
+
+      
+
+      
+
+      try {
+        if (typeof(List<Pet>) == typeof(byte[])) {
+          
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as List<Pet>;
+          
+          
+        } else {
+          
+          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          if (response != null){
+             return (List<Pet>) ApiInvoker.deserialize(response, typeof(List<Pet>));
+          }
+          else {
+            return null;
+          }
+          
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return null;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+    /// </summary>
+    /// <param name="Tags">Tags to filter by</param>
+    
+    /// <returns></returns>
+    public List<Pet>  FindPetsByTags (List<string> Tags) {
+      // create path and map variables
+      var path = "/pet/findByTags".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      if (Tags != null){
+        queryParams.Add("tags", apiInvoker.ParameterToString(Tags));
+      }
+      
+
+      
+
+      
+
+      try {
+        if (typeof(List<Pet>) == typeof(byte[])) {
+          
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as List<Pet>;
+          
+          
+        } else {
+          
+          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          if (response != null){
+             return (List<Pet>) ApiInvoker.deserialize(response, typeof(List<Pet>));
+          }
+          else {
+            return null;
+          }
+          
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return null;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+    /// </summary>
+    /// <param name="PetId">ID of pet that needs to be fetched</param>
+    
+    /// <returns></returns>
+    public Pet  GetPetById (long? PetId) {
+      // create path and map variables
+      var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.ParameterToString(PetId));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(Pet) == typeof(byte[])) {
+          
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as Pet;
+          
+          
+        } else {
+          
+          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          if (response != null){
+             return (Pet) ApiInvoker.deserialize(response, typeof(Pet));
+          }
+          else {
+            return null;
+          }
+          
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return null;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Updates a pet in the store with form data 
+    /// </summary>
+    /// <param name="PetId">ID of pet that needs to be updated</param>
+     /// <param name="Name">Updated name of the pet</param>
+     /// <param name="Status">Updated status of the pet</param>
+    
+    /// <returns></returns>
+    public void  UpdatePetWithForm (string PetId, string Name, string Status) {
+      // create path and map variables
+      var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.ParameterToString(PetId));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      if (Name != null){
+        if(Name is byte[]) {
+          formParams.Add("name", Name);
+        } else {
+          formParams.Add("name", apiInvoker.ParameterToString(Name));
+        }
+      }
+      if (Status != null){
+        if(Status is byte[]) {
+          formParams.Add("status", Status);
+        } else {
+          formParams.Add("status", apiInvoker.ParameterToString(Status));
+        }
+      }
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "POST", queryParams, null, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Deletes a pet 
+    /// </summary>
+    /// <param name="ApiKey"></param>
+     /// <param name="PetId">Pet id to delete</param>
+    
+    /// <returns></returns>
+    public void  DeletePet (string ApiKey, long? PetId) {
+      // create path and map variables
+      var path = "/pet/{petId}".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.ParameterToString(PetId));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      headerParams.Add("api_key", apiInvoker.ParameterToString(ApiKey));
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// uploads an image 
+    /// </summary>
+    /// <param name="PetId">ID of pet to update</param>
+     /// <param name="AdditionalMetadata">Additional data to pass to server</param>
+     /// <param name="File">file to upload</param>
+    
+    /// <returns></returns>
+    public void  UploadFile (long? PetId, string AdditionalMetadata, byte[] File) {
+      // create path and map variables
+      var path = "/pet/{petId}/uploadImage".Replace("{format}","json").Replace("{" + "petId" + "}", apiInvoker.ParameterToString(PetId));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      if (AdditionalMetadata != null){
+        if(AdditionalMetadata is byte[]) {
+          formParams.Add("additionalMetadata", AdditionalMetadata);
+        } else {
+          formParams.Add("additionalMetadata", apiInvoker.ParameterToString(AdditionalMetadata));
+        }
+      }
+      if (File != null){
+        if(File is byte[]) {
+          formParams.Add("file", File);
+        } else {
+          formParams.Add("file", apiInvoker.ParameterToString(File));
+        }
+      }
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "POST", queryParams, null, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+  }
+  
+}
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs
new file mode 100644
index 00000000000..2514539e298
--- /dev/null
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs
@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using io.swagger.client;
+using io.swagger.Model;
+
+namespace io.swagger.Api {
+  
+  public class StoreApi {
+    string basePath;
+    private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
+
+    public StoreApi(String basePath = "http://petstore.swagger.io/v2")
+    {
+      this.basePath = basePath;
+    }
+
+    public ApiInvoker getInvoker() {
+      return apiInvoker;
+    }
+
+    // Sets the endpoint base url for the services being accessed
+    public void setBasePath(string basePath) {
+      this.basePath = basePath;
+    }
+
+    // Gets the endpoint base url for the services being accessed
+    public String getBasePath() {
+      return basePath;
+    }
+
+    
+
+    /// <summary>
+    /// Returns pet inventories by status Returns a map of status codes to quantities
+    /// </summary>
+    
+    /// <returns></returns>
+    public Dictionary<String, int?>  GetInventory () {
+      // create path and map variables
+      var path = "/store/inventory".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(Dictionary<String, int?>) == typeof(byte[])) {
+          
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as Dictionary<String, int?>;
+          
+          
+        } else {
+          
+          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          if (response != null){
+             return (Dictionary<String, int?>) ApiInvoker.deserialize(response, typeof(Dictionary<String, int?>));
+          }
+          else {
+            return null;
+          }
+          
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return null;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Place an order for a pet 
+    /// </summary>
+    /// <param name="Body">order placed for purchasing the pet</param>
+    
+    /// <returns></returns>
+    public Order  PlaceOrder (Order Body) {
+      // create path and map variables
+      var path = "/store/order".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(Order) == typeof(byte[])) {
+          
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as Order;
+          
+          
+        } else {
+          
+          var response = apiInvoker.invokeAPI(basePath, path, "POST", queryParams, Body, headerParams, formParams);
+          if (response != null){
+             return (Order) ApiInvoker.deserialize(response, typeof(Order));
+          }
+          else {
+            return null;
+          }
+          
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return null;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+    /// </summary>
+    /// <param name="OrderId">ID of pet that needs to be fetched</param>
+    
+    /// <returns></returns>
+    public Order  GetOrderById (string OrderId) {
+      // create path and map variables
+      var path = "/store/order/{orderId}".Replace("{format}","json").Replace("{" + "orderId" + "}", apiInvoker.ParameterToString(OrderId));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(Order) == typeof(byte[])) {
+          
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as Order;
+          
+          
+        } else {
+          
+          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          if (response != null){
+             return (Order) ApiInvoker.deserialize(response, typeof(Order));
+          }
+          else {
+            return null;
+          }
+          
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return null;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    /// </summary>
+    /// <param name="OrderId">ID of the order that needs to be deleted</param>
+    
+    /// <returns></returns>
+    public void  DeleteOrder (string OrderId) {
+      // create path and map variables
+      var path = "/store/order/{orderId}".Replace("{format}","json").Replace("{" + "orderId" + "}", apiInvoker.ParameterToString(OrderId));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+  }
+  
+}
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs
new file mode 100644
index 00000000000..4f1f4a1bf19
--- /dev/null
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs
@@ -0,0 +1,435 @@
+using System;
+using System.Collections.Generic;
+using io.swagger.client;
+using io.swagger.Model;
+
+namespace io.swagger.Api {
+  
+  public class UserApi {
+    string basePath;
+    private readonly ApiInvoker apiInvoker = ApiInvoker.GetInstance();
+
+    public UserApi(String basePath = "http://petstore.swagger.io/v2")
+    {
+      this.basePath = basePath;
+    }
+
+    public ApiInvoker getInvoker() {
+      return apiInvoker;
+    }
+
+    // Sets the endpoint base url for the services being accessed
+    public void setBasePath(string basePath) {
+      this.basePath = basePath;
+    }
+
+    // Gets the endpoint base url for the services being accessed
+    public String getBasePath() {
+      return basePath;
+    }
+
+    
+
+    /// <summary>
+    /// Create user This can only be done by the logged in user.
+    /// </summary>
+    /// <param name="Body">Created user object</param>
+    
+    /// <returns></returns>
+    public void  CreateUser (User Body) {
+      // create path and map variables
+      var path = "/user".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "POST", queryParams, Body, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Creates list of users with given input array 
+    /// </summary>
+    /// <param name="Body">List of user object</param>
+    
+    /// <returns></returns>
+    public void  CreateUsersWithArrayInput (List<User> Body) {
+      // create path and map variables
+      var path = "/user/createWithArray".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "POST", queryParams, Body, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Creates list of users with given input array 
+    /// </summary>
+    /// <param name="Body">List of user object</param>
+    
+    /// <returns></returns>
+    public void  CreateUsersWithListInput (List<User> Body) {
+      // create path and map variables
+      var path = "/user/createWithList".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "POST", queryParams, Body, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Logs user into the system 
+    /// </summary>
+    /// <param name="Username">The user name for login</param>
+     /// <param name="Password">The password for login in clear text</param>
+    
+    /// <returns></returns>
+    public string  LoginUser (string Username, string Password) {
+      // create path and map variables
+      var path = "/user/login".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      if (Username != null){
+        queryParams.Add("username", apiInvoker.ParameterToString(Username));
+      }
+      if (Password != null){
+        queryParams.Add("password", apiInvoker.ParameterToString(Password));
+      }
+      
+
+      
+
+      
+
+      try {
+        if (typeof(string) == typeof(byte[])) {
+          
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as string;
+          
+          
+        } else {
+          
+          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          if (response != null){
+             return (string) ApiInvoker.deserialize(response, typeof(string));
+          }
+          else {
+            return null;
+          }
+          
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return null;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Logs out current logged in user session 
+    /// </summary>
+    
+    /// <returns></returns>
+    public void  LogoutUser () {
+      // create path and map variables
+      var path = "/user/logout".Replace("{format}","json");
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Get user by user name 
+    /// </summary>
+    /// <param name="Username">The name that needs to be fetched. Use user1 for testing. </param>
+    
+    /// <returns></returns>
+    public User  GetUserByName (string Username) {
+      // create path and map variables
+      var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.ParameterToString(Username));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(User) == typeof(byte[])) {
+          
+          var response = apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return ((object)response) as User;
+          
+          
+        } else {
+          
+          var response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          if (response != null){
+             return (User) ApiInvoker.deserialize(response, typeof(User));
+          }
+          else {
+            return null;
+          }
+          
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return null;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Updated user This can only be done by the logged in user.
+    /// </summary>
+    /// <param name="Username">name that need to be deleted</param>
+     /// <param name="Body">Updated user object</param>
+    
+    /// <returns></returns>
+    public void  UpdateUser (string Username, User Body) {
+      // create path and map variables
+      var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.ParameterToString(Username));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "PUT", queryParams, Body, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+
+    /// <summary>
+    /// Delete user This can only be done by the logged in user.
+    /// </summary>
+    /// <param name="Username">The name that needs to be deleted</param>
+    
+    /// <returns></returns>
+    public void  DeleteUser (string Username) {
+      // create path and map variables
+      var path = "/user/{username}".Replace("{format}","json").Replace("{" + "username" + "}", apiInvoker.ParameterToString(Username));
+
+      // query params
+      var queryParams = new Dictionary<String, String>();
+      var headerParams = new Dictionary<String, String>();
+      var formParams = new Dictionary<String, object>();
+
+      
+
+      
+
+      
+
+      
+
+      try {
+        if (typeof(void) == typeof(byte[])) {
+          
+          
+          apiInvoker.invokeBinaryAPI(basePath, path, "GET", queryParams, null, headerParams, formParams);
+          return;
+          
+        } else {
+          
+          
+          apiInvoker.invokeAPI(basePath, path, "DELETE", queryParams, null, headerParams, formParams);
+          return;
+          
+        }
+      } catch (ApiException ex) {
+        if(ex.ErrorCode == 404) {
+          return ;
+        }
+        else {
+          throw ex;
+        }
+      }
+    }
+    
+  }
+  
+}
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Category.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs
similarity index 53%
rename from samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Category.cs
rename to samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs
index dfad92a046f..bfe1c0c4be8 100644
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Category.cs
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs
@@ -3,19 +3,32 @@ using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Com.Wordnik.Petstore.Model {
+namespace io.swagger.Model {
   public class Category {
-    public long id { get; set; }
+    
 
-    public string name { get; set; }
+    
+    public long? Id { get; set; }
+
+    
+
+    
+    public string Name { get; set; }
+
+    
 
     public override string ToString()  {
       var sb = new StringBuilder();
       sb.Append("class Category {\n");
-      sb.Append("  id: ").Append(id).Append("\n");
-      sb.Append("  name: ").Append(name).Append("\n");
+      
+      sb.Append("  Id: ").Append(Id).Append("\n");
+      
+      sb.Append("  Name: ").Append(Name).Append("\n");
+      
       sb.Append("}\n");
       return sb.ToString();
     }
   }
-  }
+  
+  
+}
\ No newline at end of file
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
new file mode 100644
index 00000000000..20a6d7367dd
--- /dev/null
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace io.swagger.Model {
+  public class Order {
+    
+
+    
+    public long? Id { get; set; }
+
+    
+
+    
+    public long? PetId { get; set; }
+
+    
+
+    
+    public int? Quantity { get; set; }
+
+    
+
+    
+    public DateTime ShipDate { get; set; }
+
+    
+
+    /* Order Status */
+    
+    public string Status { get; set; }
+
+    
+
+    
+    public bool? Complete { get; set; }
+
+    
+
+    public override string ToString()  {
+      var sb = new StringBuilder();
+      sb.Append("class Order {\n");
+      
+      sb.Append("  Id: ").Append(Id).Append("\n");
+      
+      sb.Append("  PetId: ").Append(PetId).Append("\n");
+      
+      sb.Append("  Quantity: ").Append(Quantity).Append("\n");
+      
+      sb.Append("  ShipDate: ").Append(ShipDate).Append("\n");
+      
+      sb.Append("  Status: ").Append(Status).Append("\n");
+      
+      sb.Append("  Complete: ").Append(Complete).Append("\n");
+      
+      sb.Append("}\n");
+      return sb.ToString();
+    }
+  }
+  
+  
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs
new file mode 100644
index 00000000000..b0f3573b78c
--- /dev/null
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace io.swagger.Model {
+  public class Pet {
+    
+
+    
+    public long? Id { get; set; }
+
+    
+
+    
+    public Category Category { get; set; }
+
+    
+
+    
+    public string Name { get; set; }
+
+    
+
+    
+    public List<string> PhotoUrls { get; set; }
+
+    
+
+    
+    public List<Tag> Tags { get; set; }
+
+    
+
+    /* pet status in the store */
+    
+    public string Status { get; set; }
+
+    
+
+    public override string ToString()  {
+      var sb = new StringBuilder();
+      sb.Append("class Pet {\n");
+      
+      sb.Append("  Id: ").Append(Id).Append("\n");
+      
+      sb.Append("  Category: ").Append(Category).Append("\n");
+      
+      sb.Append("  Name: ").Append(Name).Append("\n");
+      
+      sb.Append("  PhotoUrls: ").Append(PhotoUrls).Append("\n");
+      
+      sb.Append("  Tags: ").Append(Tags).Append("\n");
+      
+      sb.Append("  Status: ").Append(Status).Append("\n");
+      
+      sb.Append("}\n");
+      return sb.ToString();
+    }
+  }
+  
+  
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Tag.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs
similarity index 52%
rename from samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Tag.cs
rename to samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs
index 61187fbd772..2fbf7070050 100644
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/Model/Tag.cs
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs
@@ -3,19 +3,32 @@ using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Com.Wordnik.Petstore.Model {
+namespace io.swagger.Model {
   public class Tag {
-    public long id { get; set; }
+    
 
-    public string name { get; set; }
+    
+    public long? Id { get; set; }
+
+    
+
+    
+    public string Name { get; set; }
+
+    
 
     public override string ToString()  {
       var sb = new StringBuilder();
       sb.Append("class Tag {\n");
-      sb.Append("  id: ").Append(id).Append("\n");
-      sb.Append("  name: ").Append(name).Append("\n");
+      
+      sb.Append("  Id: ").Append(Id).Append("\n");
+      
+      sb.Append("  Name: ").Append(Name).Append("\n");
+      
       sb.Append("}\n");
       return sb.ToString();
     }
   }
-  }
+  
+  
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs
new file mode 100644
index 00000000000..146ba13c768
--- /dev/null
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace io.swagger.Model {
+  public class User {
+    
+
+    
+    public long? Id { get; set; }
+
+    
+
+    
+    public string Username { get; set; }
+
+    
+
+    
+    public string FirstName { get; set; }
+
+    
+
+    
+    public string LastName { get; set; }
+
+    
+
+    
+    public string Email { get; set; }
+
+    
+
+    
+    public string Password { get; set; }
+
+    
+
+    
+    public string Phone { get; set; }
+
+    
+
+    /* User Status */
+    
+    public int? UserStatus { get; set; }
+
+    
+
+    public override string ToString()  {
+      var sb = new StringBuilder();
+      sb.Append("class User {\n");
+      
+      sb.Append("  Id: ").Append(Id).Append("\n");
+      
+      sb.Append("  Username: ").Append(Username).Append("\n");
+      
+      sb.Append("  FirstName: ").Append(FirstName).Append("\n");
+      
+      sb.Append("  LastName: ").Append(LastName).Append("\n");
+      
+      sb.Append("  Email: ").Append(Email).Append("\n");
+      
+      sb.Append("  Password: ").Append(Password).Append("\n");
+      
+      sb.Append("  Phone: ").Append(Phone).Append("\n");
+      
+      sb.Append("  UserStatus: ").Append(UserStatus).Append("\n");
+      
+      sb.Append("}\n");
+      return sb.ToString();
+    }
+  }
+  
+  
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/ApiException.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs
similarity index 90%
rename from samples/client/petstore/csharp/src/Com/Wordnik/Petstore/ApiException.cs
rename to samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs
index 0da40246867..01648d1607c 100644
--- a/samples/client/petstore/csharp/src/Com/Wordnik/Petstore/ApiException.cs
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Com.Wordnik.Petstore {
+namespace io.swagger.client {
   public class ApiException : Exception {
     
   	private int errorCode = 0;
@@ -18,4 +18,4 @@ namespace Com.Wordnik.Petstore {
     	this.errorCode = errorCode;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiInvoker.cs b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiInvoker.cs
new file mode 100644
index 00000000000..ee2c5b1d889
--- /dev/null
+++ b/samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiInvoker.cs
@@ -0,0 +1,235 @@
+  using System;
+  using System.Collections.Generic;
+  using System.IO;
+  using System.Linq;
+  using System.Net;
+  using System.Text;
+  using Newtonsoft.Json;
+
+  namespace io.swagger.client {
+    public class ApiInvoker {
+      private static readonly ApiInvoker _instance = new ApiInvoker();
+      private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
+
+      public static ApiInvoker GetInstance() {
+        return _instance;
+      }
+
+      /// <summary>
+      /// Add default header
+      /// </summary>
+      /// <param name="key">  Header field name
+      /// <param name="value"> Header field value
+      /// <returns></returns>
+      public void addDefaultHeader(string key, string value) {
+         defaultHeaderMap.Add(key, value);
+      }
+
+      /// <summary>
+      /// escape string (url-encoded)
+      /// </summary>
+      /// <param name="str"> String to be escaped
+      /// <returns>Escaped string</returns>
+      public string escapeString(string str) {
+        return str;
+      }
+
+      /// <summary>
+      /// if parameter is DateTime, output in ISO8601 format, otherwise just return the string
+      /// </summary>
+      /// <param name="obj"> The parameter (header, path, query, form)
+      /// <returns>Formatted string</returns>
+      public string ParameterToString(object obj)
+      {
+        return (obj is DateTime) ? ((DateTime)obj).ToString ("u") : Convert.ToString (obj);
+      }
+
+      /// <summary>
+      /// Deserialize the JSON string into a proper object
+      /// </summary>
+      /// <param name="json"> JSON string
+      /// <param name="type"> Object type
+      /// <returns>Object representation of the JSON string</returns>
+      public static object deserialize(string json, Type type) {
+        try
+        {
+            return JsonConvert.DeserializeObject(json, type);
+        }
+        catch (IOException e) {
+          throw new ApiException(500, e.Message);
+        }
+
+      }
+
+      public static string serialize(object obj) {
+        try
+        {
+            return obj != null ? JsonConvert.SerializeObject(obj) : null;
+        }
+        catch (Exception e) {
+          throw new ApiException(500, e.Message);
+        }
+      }
+
+      public string invokeAPI(string host, string path, string method, Dictionary<String, String> queryParams, object body, Dictionary<String, String> headerParams, Dictionary<String, object> formParams)
+      {
+          return invokeAPIInternal(host, path, method, false, queryParams, body, headerParams, formParams) as string;
+      }
+
+      public byte[] invokeBinaryAPI(string host, string path, string method, Dictionary<String, String> queryParams, object body, Dictionary<String, String> headerParams, Dictionary<String, object> formParams)
+      {
+          return invokeAPIInternal(host, path, method, true, queryParams, body, headerParams, formParams) as byte[];
+      }
+
+      private object invokeAPIInternal(string host, string path, string method, bool binaryResponse, Dictionary<String, String> queryParams, object body, Dictionary<String, String> headerParams, Dictionary<String, object> formParams) {
+        var b = new StringBuilder();
+
+        foreach (var queryParamItem in queryParams)
+        {
+            var value = queryParamItem.Value;
+            if (value == null) continue;
+            b.Append(b.ToString().Length == 0 ? "?" : "&");
+            b.Append(escapeString(queryParamItem.Key)).Append("=").Append(escapeString(value));
+        }
+
+        var querystring = b.ToString();
+
+          host = host.EndsWith("/") ? host.Substring(0, host.Length - 1) : host;
+
+          var client = WebRequest.Create(host + path + querystring);
+          client.Method = method;
+
+          byte[] formData = null;
+          if (formParams.Count > 0)
+          {
+              string formDataBoundary = String.Format("----------{0:N}", Guid.NewGuid());
+              client.ContentType = "multipart/form-data; boundary=" + formDataBoundary;
+              formData = GetMultipartFormData(formParams, formDataBoundary);
+              client.ContentLength = formData.Length;
+          }
+          else
+          {
+              client.ContentType = "application/json";
+          }
+
+          foreach (var headerParamsItem in headerParams)
+          {
+              client.Headers.Add(headerParamsItem.Key, headerParamsItem.Value);
+          }
+          foreach (var defaultHeaderMapItem in defaultHeaderMap.Where(defaultHeaderMapItem => !headerParams.ContainsKey(defaultHeaderMapItem.Key)))
+          {
+              client.Headers.Add(defaultHeaderMapItem.Key, defaultHeaderMapItem.Value);
+          }
+
+          switch (method)
+          {
+              case "GET":
+                  break;
+              case "POST":
+              case "PATCH":
+              case "PUT":
+              case "DELETE":
+                  using (Stream requestStream = client.GetRequestStream())
+                  {
+                      if (formData != null)
+                      {
+                          requestStream.Write(formData, 0, formData.Length);
+                      }
+
+                      var swRequestWriter = new StreamWriter(requestStream);
+                      swRequestWriter.Write(serialize(body));
+                      swRequestWriter.Close();
+                  }
+                  break;
+              default:
+                  throw new ApiException(500, "unknown method type " + method);
+          }
+
+          try
+          {
+              var webResponse = (HttpWebResponse)client.GetResponse();
+              if (webResponse.StatusCode != HttpStatusCode.OK)
+              {
+                  webResponse.Close();
+                  throw new ApiException((int)webResponse.StatusCode, webResponse.StatusDescription);
+              }
+
+              if (binaryResponse)
+              {
+                  using (var memoryStream = new MemoryStream())
+                  {
+                      webResponse.GetResponseStream().CopyTo(memoryStream);
+                      return memoryStream.ToArray();
+                  }
+              }
+              else
+              {
+                  using (var responseReader = new StreamReader(webResponse.GetResponseStream()))
+                  {
+                      var responseData = responseReader.ReadToEnd();
+                      return responseData;
+                  }
+              }
+          }
+          catch(WebException ex)
+          {
+              var response = ex.Response as HttpWebResponse;
+              int statusCode = 0;
+              if (response != null)
+              {
+                  statusCode = (int)response.StatusCode;
+                  response.Close();
+              }
+              throw new ApiException(statusCode, ex.Message);
+          }
+      }
+
+      private static byte[] GetMultipartFormData(Dictionary<string, object> postParameters, string boundary)
+      {
+          Stream formDataStream = new System.IO.MemoryStream();
+          bool needsCLRF = false;
+
+          foreach (var param in postParameters)
+          {
+              // Thanks to feedback from commenters, add a CRLF to allow multiple parameters to be added.
+              // Skip it on the first parameter, add it to subsequent parameters.
+              if (needsCLRF)
+                  formDataStream.Write(Encoding.UTF8.GetBytes("\r\n"), 0, Encoding.UTF8.GetByteCount("\r\n"));
+
+              needsCLRF = true;
+
+              if (param.Value is byte[])
+              {
+                  string postData = string.Format("--{0}\r\nContent-Disposition: form-data; name=\"{1}\"; filename=\"{1}\"\r\nContent-Type: {2}\r\n\r\n",
+                      boundary,
+                      param.Key,
+                      "application/octet-stream");
+                  formDataStream.Write(Encoding.UTF8.GetBytes(postData), 0, Encoding.UTF8.GetByteCount(postData));
+
+                  // Write the file data directly to the Stream, rather than serializing it to a string.
+                  formDataStream.Write((param.Value as byte[]), 0, (param.Value as byte[]).Length);
+              }
+              else
+              {
+                  string postData = string.Format("--{0}\r\nContent-Disposition: form-data; name=\"{1}\"\r\n\r\n{2}",
+                      boundary,
+                      param.Key,
+                      param.Value);
+                  formDataStream.Write(Encoding.UTF8.GetBytes(postData), 0, Encoding.UTF8.GetByteCount(postData));
+              }
+          }
+
+          // Add the end of the request.  Start with a newline
+          string footer = "\r\n--" + boundary + "--\r\n";
+          formDataStream.Write(Encoding.UTF8.GetBytes(footer), 0, Encoding.UTF8.GetByteCount(footer));
+
+          // Dump the Stream into a byte[]
+          formDataStream.Position = 0;
+          byte[] formData = new byte[formDataStream.Length];
+          formDataStream.Read(formData, 0, formData.Length);
+          formDataStream.Close();
+
+          return formData;
+      }
+    }
+  }
diff --git a/samples/client/petstore/java/pom.xml b/samples/client/petstore/java/pom.xml
index 10b1a29476f..82e70d8105b 100644
--- a/samples/client/petstore/java/pom.xml
+++ b/samples/client/petstore/java/pom.xml
@@ -2,9 +2,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
-  <artifactId>swagger-client</artifactId>
+  <artifactId>swagger-java-client</artifactId>
   <packaging>jar</packaging>
-  <name>swagger-client</name>
+  <name>swagger-java-client</name>
   <version>1.0.0</version>
   <scm>
     <connection>scm:git:git@github.com:wordnik/swagger-mustache.git</connection>
@@ -157,11 +157,10 @@
     </dependency>
   </dependencies>
   <properties>
-    <swagger-annotations-version>1.5.0-M1</swagger-annotations-version>
-    <jersey-version>1.7</jersey-version>
-    <jackson-version>2.1.4</jackson-version>
+    <swagger-annotations-version>1.5.3-M1</swagger-annotations-version>
+    <jersey-version>1.18</jersey-version>
+    <jackson-version>2.4.2</jackson-version>
     <jodatime-version>2.3</jodatime-version>
-    <junit-version>4.8.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.8.1</junit-version>
   </properties>
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
index 4380b011bac..ab6f551327f 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -16,6 +16,7 @@ import com.sun.jersey.multipart.FormDataMultiPart;
 import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.MediaType;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -40,7 +41,7 @@ public class ApiInvoker {
    * ISO 8601 date time format.
    * @see https://en.wikipedia.org/wiki/ISO_8601
    */
-  public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+  public static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
 
   /**
    * ISO 8601 date format.
@@ -52,6 +53,13 @@ public class ApiInvoker {
     // Use UTC as the default time zone.
     DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
     DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+    // Set default User-Agent.
+    setUserAgent("Java-Swagger");
+  }
+
+  public static void setUserAgent(String userAgent) {
+    INSTANCE.addDefaultHeader("User-Agent", userAgent);
   }
 
   public static Date parseDateTime(String str) {
@@ -83,11 +91,19 @@ public class ApiInvoker {
       return "";
     } else if (param instanceof Date) {
       return formatDateTime((Date) param);
+    } else if (param instanceof Collection) {
+      StringBuilder b = new StringBuilder();
+      for(Object o : (Collection)param) {
+        if(b.length() > 0) {
+          b.append(",");
+        }
+        b.append(String.valueOf(o));
+      }
+      return b.toString();
     } else {
       return String.valueOf(param);
     }
   }
-
   public void enableDebug() {
     isDebug = true;
   }
@@ -217,7 +233,7 @@ public class ApiInvoker {
     }
     else if ("DELETE".equals(method)) {
       if(body == null)
-        response = builder.delete(ClientResponse.class, serialize(body));
+        response = builder.delete(ClientResponse.class);
       else
         response = builder.type(contentType).delete(ClientResponse.class, serialize(body));
     }
@@ -228,12 +244,26 @@ public class ApiInvoker {
       return null;
     }
     else if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {
-      return (String) response.getEntity(String.class);
+      if(response.hasEntity()) {
+        return (String) response.getEntity(String.class);
+      }
+      else {
+        return "";
+      }
     }
     else {
+      String message = "error";
+      if(response.hasEntity()) {
+        try{
+          message = String.valueOf(response.getEntity(String.class));
+        }
+        catch (RuntimeException e) {
+          // e.printStackTrace();
+        }
+      }
       throw new ApiException(
                 response.getClientResponseStatus().getStatusCode(),
-                response.getEntity(String.class));
+                message);
     }
   }
 
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
index 21f5beea536..842c080024a 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java
@@ -11,6 +11,7 @@ import io.swagger.client.model.Pet;
 import java.io.File;
 
 import com.sun.jersey.multipart.FormDataMultiPart;
+import com.sun.jersey.multipart.file.FileDataBodyPart;
 
 import javax.ws.rs.core.MediaType;
 
@@ -35,7 +36,12 @@ public class PetApi {
   }
 
   
-    
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store
+   * @return void
+   */
   public void updatePet (Pet body) throws ApiException {
     Object postBody = body;
     
@@ -51,7 +57,7 @@ public class PetApi {
     
     
     String[] contentTypes = {
-      "application/json","application/xml"
+      "application/json","application/xml",
     };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -76,16 +82,16 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store
+   * @return void
+   */
   public void addPet (Pet body) throws ApiException {
     Object postBody = body;
     
@@ -101,7 +107,7 @@ public class PetApi {
     
     
     String[] contentTypes = {
-      "application/json","application/xml"
+      "application/json","application/xml",
     };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -126,16 +132,16 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma seperated strings
+   * @param status Status values that need to be considered for filter
+   * @return List<Pet>
+   */
   public List<Pet> findPetsByStatus (List<String> status) throws ApiException {
     Object postBody = null;
     
@@ -178,16 +184,16 @@ public class PetApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by
+   * @return List<Pet>
+   */
   public List<Pet> findPetsByTags (List<String> tags) throws ApiException {
     Object postBody = null;
     
@@ -230,16 +236,16 @@ public class PetApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return Pet
+   */
   public Pet getPetById (Long petId) throws ApiException {
     Object postBody = null;
     
@@ -281,16 +287,18 @@ public class PetApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated
+   * @param name Updated name of the pet
+   * @param status Updated status of the pet
+   * @return void
+   */
   public void updatePetWithForm (String petId, String name, String status) throws ApiException {
     Object postBody = null;
     
@@ -307,7 +315,7 @@ public class PetApi {
     
     
     String[] contentTypes = {
-      "application/x-www-form-urlencoded"
+      "application/x-www-form-urlencoded",
     };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -340,16 +348,17 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Deletes a pet
+   * 
+   * @param apiKey 
+   * @param petId Pet id to delete
+   * @return void
+   */
   public void deletePet (String apiKey, Long petId) throws ApiException {
     Object postBody = null;
     
@@ -392,16 +401,18 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update
+   * @param additionalMetadata Additional data to pass to server
+   * @param file file to upload
+   * @return void
+   */
   public void uploadFile (Long petId, String additionalMetadata, File file) throws ApiException {
     Object postBody = null;
     
@@ -418,7 +429,7 @@ public class PetApi {
     
     
     String[] contentTypes = {
-      "multipart/form-data"
+      "multipart/form-data",
     };
 
     String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
@@ -431,7 +442,8 @@ public class PetApi {
       mp.field("additionalMetadata", ApiInvoker.parameterToString(additionalMetadata), MediaType.MULTIPART_FORM_DATA_TYPE);
       
       hasFields = true;
-      mp.field("file", file, MediaType.MULTIPART_FORM_DATA_TYPE);
+      mp.field("file", file.getName());
+      mp.bodyPart(new FileDataBodyPart("file", file, MediaType.MULTIPART_FORM_DATA_TYPE));
       
       if(hasFields)
         postBody = mp;
@@ -451,12 +463,7 @@ public class PetApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
index 1da75191547..cff340e69d7 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java
@@ -11,6 +11,7 @@ import java.util.Map;
 import io.swagger.client.model.Order;
 
 import com.sun.jersey.multipart.FormDataMultiPart;
+import com.sun.jersey.multipart.file.FileDataBodyPart;
 
 import javax.ws.rs.core.MediaType;
 
@@ -35,7 +36,11 @@ public class StoreApi {
   }
 
   
-    
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map<String, Integer>
+   */
   public Map<String, Integer> getInventory () throws ApiException {
     Object postBody = null;
     
@@ -76,16 +81,16 @@ public class StoreApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet
+   * @return Order
+   */
   public Order placeOrder (Order body) throws ApiException {
     Object postBody = body;
     
@@ -126,16 +131,16 @@ public class StoreApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched
+   * @return Order
+   */
   public Order getOrderById (String orderId) throws ApiException {
     Object postBody = null;
     
@@ -177,16 +182,16 @@ public class StoreApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted
+   * @return void
+   */
   public void deleteOrder (String orderId) throws ApiException {
     Object postBody = null;
     
@@ -228,12 +233,7 @@ public class StoreApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
index 7b8b2cad83a..2296c0223ce 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java
@@ -11,6 +11,7 @@ import io.swagger.client.model.User;
 import java.util.*;
 
 import com.sun.jersey.multipart.FormDataMultiPart;
+import com.sun.jersey.multipart.file.FileDataBodyPart;
 
 import javax.ws.rs.core.MediaType;
 
@@ -35,7 +36,12 @@ public class UserApi {
   }
 
   
-    
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object
+   * @return void
+   */
   public void createUser (User body) throws ApiException {
     Object postBody = body;
     
@@ -76,16 +82,16 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
   public void createUsersWithArrayInput (List<User> body) throws ApiException {
     Object postBody = body;
     
@@ -126,16 +132,16 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
   public void createUsersWithListInput (List<User> body) throws ApiException {
     Object postBody = body;
     
@@ -176,16 +182,17 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login
+   * @param password The password for login in clear text
+   * @return String
+   */
   public String loginUser (String username, String password) throws ApiException {
     Object postBody = null;
     
@@ -230,16 +237,15 @@ public class UserApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Logs out current logged in user session
+   * 
+   * @return void
+   */
   public void logoutUser () throws ApiException {
     Object postBody = null;
     
@@ -280,16 +286,16 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. 
+   * @return User
+   */
   public User getUserByName (String username) throws ApiException {
     Object postBody = null;
     
@@ -331,16 +337,17 @@ public class UserApi {
         return null;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return  null;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted
+   * @param body Updated user object
+   * @return void
+   */
   public void updateUser (String username, User body) throws ApiException {
     Object postBody = body;
     
@@ -382,16 +389,16 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
-    
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted
+   * @return void
+   */
   public void deleteUser (String username) throws ApiException {
     Object postBody = null;
     
@@ -433,12 +440,7 @@ public class UserApi {
         return ;
       }
     } catch (ApiException ex) {
-      if(ex.getCode() == 404) {
-      	return ;
-      }
-      else {
-        throw ex;
-      }
+      throw ex;
     }
   }
   
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/ApiResponse.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/ApiResponse.java
new file mode 100644
index 00000000000..cd9ff24975c
--- /dev/null
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/ApiResponse.java
@@ -0,0 +1,64 @@
+package io.swagger.client.model;
+
+
+import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+public class ApiResponse  {
+  
+  private Integer code = null;
+  private String type = null;
+  private String message = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  @JsonProperty("code")
+  public Integer getCode() {
+    return code;
+  }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  @JsonProperty("type")
+  public String getType() {
+    return type;
+  }
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = false, value = "")
+  @JsonProperty("message")
+  public String getMessage() {
+    return message;
+  }
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ApiResponse {\n");
+    
+    sb.append("  code: ").append(code).append("\n");
+    sb.append("  type: ").append(type).append("\n");
+    sb.append("  message: ").append(message).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java
index 3a7a84f89bb..ad67267a2f6 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Category.java
@@ -14,7 +14,7 @@ public class Category  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -26,7 +26,7 @@ public class Category  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java
index f516f66e1fe..b9f7d1dc897 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Order.java
@@ -22,7 +22,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -34,7 +34,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("petId")
   public Long getPetId() {
     return petId;
@@ -46,7 +46,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
@@ -58,7 +58,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
   public Date getShipDate() {
     return shipDate;
@@ -71,7 +71,7 @@ public class Order  {
   /**
    * Order Status
    **/
-  @ApiModelProperty(required = false, value = "Order Status")
+  @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -83,7 +83,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
index 297e1360c70..d685a8c1cbf 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
@@ -24,7 +24,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -36,7 +36,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("category")
   public Category getCategory() {
     return category;
@@ -72,7 +72,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
@@ -85,7 +85,7 @@ public class Pet  {
   /**
    * pet status in the store
    **/
-  @ApiModelProperty(required = false, value = "pet status in the store")
+  @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java
index d9bf765477b..b9dddc92f1b 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Tag.java
@@ -14,7 +14,7 @@ public class Tag  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -26,7 +26,7 @@ public class Tag  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java
index d82288e8c25..9811a7741f9 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/User.java
@@ -20,7 +20,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,7 +32,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("username")
   public String getUsername() {
     return username;
@@ -44,7 +44,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
@@ -56,7 +56,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
@@ -68,7 +68,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("email")
   public String getEmail() {
     return email;
@@ -80,7 +80,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("password")
   public String getPassword() {
     return password;
@@ -92,7 +92,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("phone")
   public String getPhone() {
     return phone;
@@ -105,7 +105,7 @@ public class User  {
   /**
    * User Status
    **/
-  @ApiModelProperty(required = false, value = "User Status")
+  @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java
new file mode 100644
index 00000000000..97f3b5f8006
--- /dev/null
+++ b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java
@@ -0,0 +1,155 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.util.*;
+import java.io.*;
+
+import static org.junit.Assert.*;
+import org.junit.*;
+
+public class PetApiTest {
+  PetApi api = null;
+
+  @Before
+  public void setup() {
+    api = new PetApi();
+  }
+
+  @Test
+  public void testCreateAndGetPet() throws Exception {
+    Pet pet = createRandomPet();
+    api.addPet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    assertNotNull(fetched);
+    assertEquals(pet.getId(), fetched.getId());
+    assertNotNull(fetched.getCategory());
+    assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+  }
+
+  @Test
+  public void testUpdatePet() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("programmer");
+
+    api.updatePet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    assertNotNull(fetched);
+    assertEquals(pet.getId(), fetched.getId());
+    assertNotNull(fetched.getCategory());
+    assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
+  }
+
+  @Test
+  public void testFindPetsByStatus() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("programmer");
+    pet.setStatus(Pet.StatusEnum.available);
+
+    api.updatePet(pet);
+
+    List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+    assertNotNull(pets);
+
+    boolean found = false;
+    for(Pet fetched : pets) {
+      if(fetched.getId().equals(pet.getId())) {
+        found = true;
+        break;
+      }
+    }
+
+    assertTrue(found);
+  }
+
+  @Test
+  public void testFindPetsByTags() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("monster");
+    pet.setStatus(Pet.StatusEnum.available);
+
+    List<Tag> tags = new ArrayList<Tag>();
+    Tag tag1 = new Tag();
+    tag1.setName("friendly");
+    tags.add(tag1);
+    pet.setTags(tags);
+
+    api.updatePet(pet);
+
+    List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
+    assertNotNull(pets);
+
+    boolean found = false;
+    for(Pet fetched : pets) {
+      if(fetched.getId().equals(pet.getId())) {
+        found = true;
+        break;
+      }
+    }
+    assertTrue(found);
+  }
+
+  @Test
+  public void testUpdatePetWithForm() throws Exception {
+    Pet pet = createRandomPet();
+    pet.setName("frank");
+    api.addPet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    
+    api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
+    Pet updated = api.getPetById(fetched.getId());
+
+    assertEquals(updated.getName(), fetched.getName());
+  }
+
+  @Test
+  public void testDeletePet() throws Exception {
+    Pet pet = createRandomPet();
+    api.addPet(pet);
+
+    Pet fetched = api.getPetById(pet.getId());
+    api.deletePet(null, fetched.getId());
+
+    try {
+      fetched = api.getPetById(fetched.getId());
+      fail("expected an error");
+    }
+    catch (ApiException e) {
+      assertEquals(404, e.getCode());
+    }
+  }
+
+  @Test
+  public void testUploadFile() throws Exception {
+    Pet pet = createRandomPet();
+    api.addPet(pet);
+
+    File file = new File("hello.txt");
+    BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+    writer.write("Hello world!");
+    writer.close();
+
+    api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+  }
+
+  private Pet createRandomPet() {
+    Pet pet = new Pet();
+    pet.setId(System.currentTimeMillis());
+    pet.setName("gorilla");
+
+    Category category = new Category();
+    category.setName("really-happy");
+
+    pet.setCategory(category);
+    pet.setStatus(Pet.StatusEnum.available);
+    List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+    pet.setPhotoUrls(photos);
+
+    return pet;
+  }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java
new file mode 100644
index 00000000000..25a52009b9e
--- /dev/null
+++ b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java
@@ -0,0 +1,68 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.util.*;
+import java.io.*;
+
+import static org.junit.Assert.*;
+import org.junit.*;
+
+public class StoreApiTest {
+  StoreApi api = null;
+
+  @Before
+  public void setup() {
+    api = new StoreApi();
+  }
+
+  @Test
+  public void testGetInventory() throws Exception {
+    Map<String, Integer> inventory = api.getInventory();
+    assertTrue(inventory.keySet().size() > 0);
+  }
+
+  @Test
+  public void testPlaceOrder() throws Exception {
+    Order order = createOrder();
+    api.placeOrder(order);
+
+    Order fetched = api.getOrderById(String.valueOf(order.getId()));
+    assertEquals(order.getId(), fetched.getId());
+    assertEquals(order.getPetId(), fetched.getPetId());
+    assertEquals(order.getQuantity(), fetched.getQuantity());
+  }
+
+  @Test
+  public void testDeleteOrder() throws Exception {
+    Order order = createOrder();
+    api.placeOrder(order);
+
+    Order fetched = api.getOrderById(String.valueOf(order.getId()));
+    assertEquals(fetched.getId(), order.getId());
+
+    api.deleteOrder(String.valueOf(order.getId()));
+
+    try {
+      api.getOrderById(String.valueOf(order.getId()));
+      // fail("expected an error");
+    }
+    catch (ApiException e) {
+      // ok
+    }
+  }
+
+  private Order createOrder() {
+    Order order = new Order();
+    order.setId(new Long(System.currentTimeMillis()));
+    order.setPetId(new Long(200));
+    order.setQuantity(new Integer(13));
+    order.setShipDate(new java.util.Date());
+    order.setStatus(Order.StatusEnum.placed);
+    order.setComplete(true);
+
+    return order;
+  }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java
new file mode 100644
index 00000000000..9d683faab7a
--- /dev/null
+++ b/samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java
@@ -0,0 +1,84 @@
+package io.swagger.petstore.test;
+
+import io.swagger.client.ApiException;
+import io.swagger.client.api.*;
+import io.swagger.client.model.*;
+
+import java.util.*;
+import java.io.*;
+
+import static org.junit.Assert.*;
+import org.junit.*;
+
+public class UserApiTest {
+  UserApi api = null;
+
+  @Before
+  public void setup() {
+    api = new UserApi();
+  }
+
+  @Test
+  public void testCreateUser() throws Exception {
+    User user = createUser();
+
+    api.createUser(user);
+
+    User fetched = api.getUserByName(user.getUsername());
+    assertEquals(user.getId(), fetched.getId());
+  }
+
+  @Test
+  public void testCreateUsersWithArray() throws Exception {
+    User user1 = createUser();
+    user1.setUsername("abc123");
+    User user2 = createUser();
+    user2.setUsername("123abc");
+
+    api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
+
+    User fetched = api.getUserByName(user1.getUsername());
+    assertEquals(user1.getId(), fetched.getId());
+  }
+
+  @Test
+  public void testCreateUsersWithList() throws Exception {
+    User user1 = createUser();
+    user1.setUsername("abc123");
+    User user2 = createUser();
+    user2.setUsername("123abc");
+
+    api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
+
+    User fetched = api.getUserByName(user1.getUsername());
+    assertEquals(user1.getId(), fetched.getId());
+  }
+
+  @Test
+  public void testLoginUser() throws Exception {
+    User user = createUser();
+    api.createUser(user);
+
+    String token = api.loginUser(user.getUsername(), user.getPassword());
+    assertTrue(token.startsWith("logged in user session:"));
+  }
+
+  @Test
+  public void logoutUser() throws Exception {
+    api.logoutUser();
+  }
+
+  private User createUser() {
+    User user = new User();
+    user.setId(System.currentTimeMillis());
+    user.setUsername("fred");
+    user.setFirstName("Fred");
+    user.setLastName("Meyer");
+    user.setEmail("fred@fredmeyer.com");
+    user.setPassword("xxXXxx");
+    user.setPhone("408-867-5309");
+    user.setUserStatus(123);
+
+    return user;
+  }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj
index 66a244ebf3a..24cb04d3f7c 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj
+++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj
@@ -18,12 +18,14 @@
 		EA6699B01811D2FA00A70D03 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA6699AE1811D2FA00A70D03 /* Main_iPad.storyboard */; };
 		EA6699B31811D2FA00A70D03 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699B21811D2FA00A70D03 /* ViewController.m */; };
 		EA6699B51811D2FA00A70D03 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA6699B41811D2FA00A70D03 /* Images.xcassets */; };
-		EA6699BC1811D2FB00A70D03 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA6699BB1811D2FB00A70D03 /* XCTest.framework */; };
 		EA6699BD1811D2FB00A70D03 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA6699991811D2FA00A70D03 /* Foundation.framework */; };
 		EA6699BE1811D2FB00A70D03 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA66999D1811D2FA00A70D03 /* UIKit.framework */; };
 		EA6699C61811D2FB00A70D03 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA6699C41811D2FB00A70D03 /* InfoPlist.strings */; };
-		EA6699C81811D2FB00A70D03 /* PetApiTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699C71811D2FB00A70D03 /* PetApiTest.m */; };
+		EA8B8AA41AC6683700638FBB /* SWGQueryParamCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8B8AA31AC6683700638FBB /* SWGQueryParamCollection.m */; };
 		EA8CD3ED1AC2763600C47D0B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */; };
+		EAB26B091AC8DE24002F5C7A /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EAB26B081AC8DE24002F5C7A /* libPods.a */; };
+		EAB26B0C1AC8DF78002F5C7A /* PetApiTest.h in Sources */ = {isa = PBXBuildFile; fileRef = EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */; };
+		EAB26B0D1AC8DF78002F5C7A /* PetApiTest.m in Sources */ = {isa = PBXBuildFile; fileRef = EA6699C71811D2FB00A70D03 /* PetApiTest.m */; };
 		EAEA85E41811D3AE00F06E69 /* SWGApiClient.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85CD1811D3AE00F06E69 /* SWGApiClient.m */; };
 		EAEA85E51811D3AE00F06E69 /* SWGCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85CF1811D3AE00F06E69 /* SWGCategory.m */; };
 		EAEA85E61811D3AE00F06E69 /* SWGDate.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85D11811D3AE00F06E69 /* SWGDate.m */; };
@@ -36,7 +38,6 @@
 		EAEA85ED1811D3AE00F06E69 /* SWGTag.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85DF1811D3AE00F06E69 /* SWGTag.m */; };
 		EAEA85EE1811D3AE00F06E69 /* SWGUser.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85E11811D3AE00F06E69 /* SWGUser.m */; };
 		EAEA85EF1811D3AE00F06E69 /* SWGUserApi.m in Sources */ = {isa = PBXBuildFile; fileRef = EAEA85E31811D3AE00F06E69 /* SWGUserApi.m */; };
-		EAEA85F11811D8F100F06E69 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EAEA85F01811D8F100F06E69 /* libPods.a */; };
 		EAFBEABB1A925B8500A27431 /* test-1.png in Resources */ = {isa = PBXBuildFile; fileRef = EAFBEABA1A925B8500A27431 /* test-1.png */; };
 		EAFBEABE1A92C42700A27431 /* SWGApiResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = EAFBEABD1A92C42700A27431 /* SWGApiResponse.m */; };
 /* End PBXBuildFile section */
@@ -71,12 +72,15 @@
 		EA6699B21811D2FA00A70D03 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		EA6699B41811D2FA00A70D03 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		EA6699BA1811D2FB00A70D03 /* PetstoreClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PetstoreClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		EA6699BB1811D2FB00A70D03 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		EA6699C31811D2FB00A70D03 /* PetstoreClientTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PetstoreClientTests-Info.plist"; sourceTree = "<group>"; };
 		EA6699C51811D2FB00A70D03 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		EA6699C71811D2FB00A70D03 /* PetApiTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PetApiTest.m; sourceTree = "<group>"; };
+		EA8B8AA21AC6683700638FBB /* SWGQueryParamCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGQueryParamCollection.h; sourceTree = "<group>"; };
+		EA8B8AA31AC6683700638FBB /* SWGQueryParamCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGQueryParamCollection.m; sourceTree = "<group>"; };
 		EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PetApiTest.h; sourceTree = "<group>"; };
 		EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
+		EAB26B081AC8DE24002F5C7A /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = "/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos/libPods.a"; sourceTree = "<absolute>"; };
+		EAB26B0E1AC8E692002F5C7A /* SWGPet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGPet.h; sourceTree = "<group>"; };
 		EAEA85CC1811D3AE00F06E69 /* SWGApiClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGApiClient.h; sourceTree = "<group>"; };
 		EAEA85CD1811D3AE00F06E69 /* SWGApiClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGApiClient.m; sourceTree = "<group>"; };
 		EAEA85CE1811D3AE00F06E69 /* SWGCategory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGCategory.h; sourceTree = "<group>"; };
@@ -89,7 +93,6 @@
 		EAEA85D51811D3AE00F06E69 /* SWGObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGObject.m; sourceTree = "<group>"; };
 		EAEA85D61811D3AE00F06E69 /* SWGOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGOrder.h; sourceTree = "<group>"; };
 		EAEA85D71811D3AE00F06E69 /* SWGOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGOrder.m; sourceTree = "<group>"; };
-		EAEA85D81811D3AE00F06E69 /* SWGPet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGPet.h; sourceTree = "<group>"; };
 		EAEA85D91811D3AE00F06E69 /* SWGPet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGPet.m; sourceTree = "<group>"; };
 		EAEA85DA1811D3AE00F06E69 /* SWGPetApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGPetApi.h; sourceTree = "<group>"; };
 		EAEA85DB1811D3AE00F06E69 /* SWGPetApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGPetApi.m; sourceTree = "<group>"; };
@@ -101,7 +104,6 @@
 		EAEA85E11811D3AE00F06E69 /* SWGUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGUser.m; sourceTree = "<group>"; };
 		EAEA85E21811D3AE00F06E69 /* SWGUserApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGUserApi.h; sourceTree = "<group>"; };
 		EAEA85E31811D3AE00F06E69 /* SWGUserApi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGUserApi.m; sourceTree = "<group>"; };
-		EAEA85F01811D8F100F06E69 /* libPods.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPods.a; path = "../Pods/build/Debug-iphoneos/libPods.a"; sourceTree = "<group>"; };
 		EAFBEABA1A925B8500A27431 /* test-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "test-1.png"; sourceTree = "<group>"; };
 		EAFBEABC1A92C42700A27431 /* SWGApiResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGApiResponse.h; sourceTree = "<group>"; };
 		EAFBEABD1A92C42700A27431 /* SWGApiResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWGApiResponse.m; sourceTree = "<group>"; };
@@ -124,10 +126,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				EA8CD3ED1AC2763600C47D0B /* SenTestingKit.framework in Frameworks */,
-				EAEA85F11811D8F100F06E69 /* libPods.a in Frameworks */,
-				EA6699BC1811D2FB00A70D03 /* XCTest.framework in Frameworks */,
 				EA6699BE1811D2FB00A70D03 /* UIKit.framework in Frameworks */,
 				EA6699BD1811D2FB00A70D03 /* Foundation.framework in Frameworks */,
+				EAB26B091AC8DE24002F5C7A /* libPods.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -167,12 +168,11 @@
 		EA6699981811D2FA00A70D03 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				EAB26B081AC8DE24002F5C7A /* libPods.a */,
 				EA8CD3EC1AC2763600C47D0B /* SenTestingKit.framework */,
-				EAEA85F01811D8F100F06E69 /* libPods.a */,
 				EA6699991811D2FA00A70D03 /* Foundation.framework */,
 				EA66999B1811D2FA00A70D03 /* CoreGraphics.framework */,
 				EA66999D1811D2FA00A70D03 /* UIKit.framework */,
-				EA6699BB1811D2FB00A70D03 /* XCTest.framework */,
 				73DA4F1067C343C3962F1542 /* libPods.a */,
 			);
 			name = Frameworks;
@@ -227,6 +227,8 @@
 		EAEA85CB1811D3AE00F06E69 /* client */ = {
 			isa = PBXGroup;
 			children = (
+				EA8B8AA21AC6683700638FBB /* SWGQueryParamCollection.h */,
+				EA8B8AA31AC6683700638FBB /* SWGQueryParamCollection.m */,
 				EAFBEABC1A92C42700A27431 /* SWGApiResponse.h */,
 				EAFBEABD1A92C42700A27431 /* SWGApiResponse.m */,
 				EAEA85CC1811D3AE00F06E69 /* SWGApiClient.h */,
@@ -241,7 +243,7 @@
 				EAEA85D51811D3AE00F06E69 /* SWGObject.m */,
 				EAEA85D61811D3AE00F06E69 /* SWGOrder.h */,
 				EAEA85D71811D3AE00F06E69 /* SWGOrder.m */,
-				EAEA85D81811D3AE00F06E69 /* SWGPet.h */,
+				EAB26B0E1AC8E692002F5C7A /* SWGPet.h */,
 				EAEA85D91811D3AE00F06E69 /* SWGPet.m */,
 				EAEA85DA1811D3AE00F06E69 /* SWGPetApi.h */,
 				EAEA85DB1811D3AE00F06E69 /* SWGPetApi.m */,
@@ -268,8 +270,8 @@
 				04DAA264FD78471BBAD25173 /* Check Pods Manifest.lock */,
 				EA6699921811D2FA00A70D03 /* Sources */,
 				EA6699931811D2FA00A70D03 /* Frameworks */,
-				EA6699941811D2FA00A70D03 /* Resources */,
 				3692D11BB04F489DAA7C0B6A /* Copy Pods Resources */,
+				EA6699941811D2FA00A70D03 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -304,6 +306,7 @@
 		EA66998E1811D2FA00A70D03 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastTestingUpgradeCheck = 0620;
 				LastUpgradeCheck = 0500;
 				ORGANIZATIONNAME = Reverb;
 				TargetAttributes = {
@@ -407,6 +410,7 @@
 				EAEA85EC1811D3AE00F06E69 /* SWGStoreApi.m in Sources */,
 				EAEA85E91811D3AE00F06E69 /* SWGOrder.m in Sources */,
 				EAEA85E81811D3AE00F06E69 /* SWGObject.m in Sources */,
+				EA8B8AA41AC6683700638FBB /* SWGQueryParamCollection.m in Sources */,
 				EAEA85E71811D3AE00F06E69 /* SWGFile.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -415,7 +419,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EA6699C81811D2FB00A70D03 /* PetApiTest.m in Sources */,
+				EAB26B0C1AC8DF78002F5C7A /* PetApiTest.h in Sources */,
+				EAB26B0D1AC8DF78002F5C7A /* PetApiTest.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -548,6 +553,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
 				INFOPLIST_FILE = "PetstoreClient/PetstoreClient-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -562,6 +571,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
 				INFOPLIST_FILE = "PetstoreClient/PetstoreClient-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -569,6 +582,7 @@
 		};
 		EA6699CF1811D2FB00A70D03 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = E2B6DA00BE52336E23783686 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PetstoreClient.app/PetstoreClient";
@@ -584,6 +598,10 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "PetstoreClientTests/PetstoreClientTests-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;
@@ -592,6 +610,7 @@
 		};
 		EA6699D01811D2FB00A70D03 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = A425648B5C0A4849C7668069 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PetstoreClient.app/PetstoreClient";
@@ -603,6 +622,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch";
 				INFOPLIST_FILE = "PetstoreClientTests/PetstoreClientTests-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				WRAPPER_EXTENSION = xctest;
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m
index 7aecfc27bf7..7c47bb1f271 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m
+++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m
@@ -20,8 +20,8 @@
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
     
+/*
     SWGPetApi * api = [[SWGPetApi alloc] init];
-    /*
     [api getPetByIdWithCompletionBlock:@10 completionHandler:^(SWGPet *output, NSError *error) {
         NSLog(@"%@", [output asDictionary]);
         [output set_id:@101];
diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m b/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m
index a4539c9255b..6fb2b6e57c2 100644
--- a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m
+++ b/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m
@@ -6,97 +6,44 @@
 - (void)setUp {
     [super setUp];
     api = [[SWGPetApi alloc ]init];
-//    [[SWGApiClient sharedClientFromPool]setLoggingEnabled:true];
-    [SWGPetApi setBasePath:@"http://localhost:8002/api"];
 }
 
 - (void)tearDown {
     [super tearDown];
 }
 
-- (void)testGetPetById {
+- (void)testCreateAndGetPet {
     XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetById"];
-    [api getPetByIdWithCompletionBlock:@1 completionHandler:^(SWGPet *output, NSError *error) {
-        if(error){
-            XCTFail(@"got error %@", error);
-        }
-        if(output){
-            XCTAssertNotNil([output _id], @"token was nil");
-        }
-        [expectation fulfill];
-    }];
-    [self waitForExpectationsWithTimeout:2.0 handler:nil];
-}
+    SWGPet* pet = [self createPet];
 
-- (void) testAddPet {
-    XCTestExpectation *expectation = [self expectationWithDescription:@"testAddPet"];
-    
-    SWGPet * petToAdd = [[SWGPet alloc] init];
-    [petToAdd set_id:@1000];
-    NSMutableArray* tags = [[NSMutableArray alloc] init];
-    for(int i = 0; i < 5; i++){
-        SWGTag * tag = [[SWGTag alloc] init];
-        [tag set_id:[NSNumber numberWithInt:i]];
-        [tag setName:[NSString stringWithFormat:@"tag-%d", i]];
-        [tags addObject:tag];
-    }
-    [petToAdd setTags:tags];
-    [petToAdd setStatus:@"lost"];
-    
-    SWGCategory * category = [[SWGCategory alloc] init];
-    [category setName:@"sold"];
-    [petToAdd setCategory:category];
-    [petToAdd setName:@"dragon"];
-    
-    NSMutableArray* photos = [[NSMutableArray alloc] init];
-    for(int i = 0; i < 10; i++){
-        NSString * url = [NSString stringWithFormat:@"http://foo.com/photo/%d", i];
-        [photos addObject:url];
-    }
-    [petToAdd setPhotoUrls:photos];
-    
-    [api addPetWithCompletionBlock:petToAdd completionHandler:^(NSError *error) {
+    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
         if(error){
             XCTFail(@"got error %@", error);
         }
-        [expectation fulfill];
+        NSLog(@"%@", [pet _id]);
+        [api getPetByIdWithCompletionBlock:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
+            if(error){
+                XCTFail(@"got error %@", error);
+            }
+            if(output){
+                XCTAssertNotNil([output _id], @"token was nil");
+            }
+            [expectation fulfill];
+        }];
     }];
-    
-    [self waitForExpectationsWithTimeout:2.0 handler:nil];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
 }
 
 - (void) testUpdatePet {
     XCTestExpectation *expectation = [self expectationWithDescription:@"testUpdatePet"];
-    SWGPet * petToAdd = [[SWGPet alloc] init];
-    [petToAdd set_id:[NSNumber numberWithInt:1000]];
-    NSMutableArray* tags = [[NSMutableArray alloc] init];
-    for(int i = 0; i < 5; i++){
-        SWGTag * tag = [[SWGTag alloc] init];
-        [tag set_id:[NSNumber numberWithInt:i]];
-        [tag setName:[NSString stringWithFormat:@"tag-%d", i]];
-        [tags addObject:tag];
-    }
-    [petToAdd setTags:tags];
-    [petToAdd setStatus:@"lost"];
-    
-    SWGCategory * category = [[SWGCategory alloc] init];
-    [category setName:@"sold"];
-    [petToAdd setCategory:category];
-    [petToAdd setName:@"dragon"];
-    
-    NSMutableArray* photos = [[NSMutableArray alloc] init];
-    for(int i = 0; i < 10; i++){
-        NSString * url = [NSString stringWithFormat:@"http://foo.com/photo/%d", i];
-        [photos addObject:url];
-    }
-    [petToAdd setPhotoUrls:photos];
+    SWGPet* pet = [self createPet];
 
-    [api addPetWithCompletionBlock:petToAdd completionHandler:^(NSError *error) {
+    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
         if(error) {
             XCTFail(@"got error %@", error);
         }
         else {
-            [api getPetByIdWithCompletionBlock:[NSString stringWithFormat:@"%@",[petToAdd _id]] completionHandler:^(SWGPet *output, NSError *error) {
+            [api getPetByIdWithCompletionBlock:[NSString stringWithFormat:@"%@",[pet _id]] completionHandler:^(SWGPet *output, NSError *error) {
                 if(error) {
                     XCTFail(@"got error %@", error);
                 }
@@ -104,9 +51,9 @@
                     NSLog(@"failed to fetch pet");
                 }
                 else {
-                    SWGPet* pet = [[SWGPet alloc] initWithValues:[output asDictionary]];
+                    SWGPet* pet = [[SWGPet alloc] initWithDictionary:[output toDictionary] error:nil];
                     NSLog(@"got the pet");
-                    
+
                     [pet setName:@"programmer"];
                     [pet setStatus:@"confused"];
 
@@ -115,7 +62,7 @@
                                         if(error) {
                                             XCTFail(@"got error %@", error);
                                         }
-                                        [api getPetByIdWithCompletionBlock:@1000 completionHandler:^(SWGPet *output, NSError *error) {
+                                        [api getPetByIdWithCompletionBlock:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
                                             if(error) {
                                                 XCTFail(@"got error %@", error);
                                             }
@@ -123,7 +70,7 @@
                                                 NSLog(@"failed to fetch pet");
                                             }
                                             else {
-                                                SWGPet* pet = [[SWGPet alloc] initWithValues:[output asDictionary]];
+                                                SWGPet* pet = [[SWGPet alloc] initWithDictionary:[output toDictionary] error:nil];
                                                 XCTAssertNotNil([pet _id], @"pet was nil");
                                                 XCTAssertEqualObjects([pet name], @"programmer", @"pet name was not updated");
                                                 XCTAssertEqualObjects([pet status], @"confused", @"pet status was not updated");
@@ -136,44 +83,152 @@
             }];
         }
     }];
-    [self waitForExpectationsWithTimeout:2.0 handler:nil];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
 }
 
 - (void)testGetPetByStatus {
     XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetByStatus"];
-    [api findPetsByStatusWithCompletionBlock:@"available" completionHandler:^(NSArray *output, NSError *error) {
+    SWGPet* pet = [self createPet];
+
+    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
         if(error) {
             XCTFail(@"got error %@", error);
         }
-        if(output == nil){
-            XCTFail(@"failed to fetch pets");
+        NSArray* status = [[NSArray alloc] initWithObjects:@"available", nil];
+        [api findPetsByStatusWithCompletionBlock:status completionHandler:^(NSArray *output, NSError *error) {
+            if(error) {
+                XCTFail(@"got error %@", error);
+            }
+            if(output == nil){
+                XCTFail(@"failed to fetch pets");
+            }
+            else {
+                bool found = false;
+                for(SWGPet* fetched in output) {
+                    if([pet _id] == [fetched _id]) {
+                        found = true;
+                    }
+                }
+                if(found)
+                    [expectation fulfill];
+            }
+        }];
+    }];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
+}
+
+- (void)testGetPetByTags {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetByTags"];
+    SWGPet* pet = [self createPet];
+    SWGTag* tag = [[SWGTag alloc] init];
+    tag.name = @"tony";
+    NSLog(@"%@", pet._id);
+    pet.tags = [[NSArray alloc] initWithObjects:tag, nil];
+
+    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
+        if(error) {
+            XCTFail(@"got error %@", error);
+        }
+        NSArray* tags = [[NSArray alloc] initWithObjects:@"tony", nil];
+
+        [api findPetsByTagsWithCompletionBlock:tags completionHandler:^(NSArray *output, NSError *error) {
+            if(error){
+                XCTFail(@"got error %@", error);
+            }
+            if(output){
+                bool hasTag = false;
+                for(SWGPet * fetched in output) {
+                    for(SWGTag * tag in [fetched tags]){
+                        if(fetched._id == pet._id && [[tag name] isEqualToString:@"tony"])
+                            hasTag = true;
+                    }
+                }
+                if(!hasTag)
+                    XCTFail(@"failed to find tag in pet");
+                if(hasTag)
+                    [expectation fulfill];
+            }
+        }];
+    }];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
+}
+
+- (void)testDeletePet {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testDeletePet"];
+
+    SWGPet* pet = [self createPet];
+
+    [api addPetWithCompletionBlock:pet completionHandler:^(NSError *error) {
+        if(error){
+            XCTFail(@"got error %@", error);
+        }
+        [api deletePetWithCompletionBlock:@"" petId:[NSString stringWithFormat:@"%@", [pet _id]] completionHandler:^(NSError *error) {
+            if(error){
+                XCTFail(@"got error %@", error);
+            }
+            [api getPetByIdWithCompletionBlock:[pet _id] completionHandler:^(SWGPet *output, NSError *error) {
+                if(error) {
+                    // good
+                    [expectation fulfill];
+
+                }
+                else {
+                    XCTFail(@"expected a failure");
+                }
+            }];
+        }];
+    }];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
+}
+
+- (void)testUploadFile {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testUploadFile"];
+
+    NSString* str = @"teststring";
+    NSData* data = [str dataUsingEncoding:NSUTF8StringEncoding];
+    
+    SWGFile * file = [[SWGFile alloc] initWithNameData: @"myFile.txt" mimeType:@"text/plain" data:data];
+    
+    [api uploadFileWithCompletionBlock:@1 additionalMetadata:@"special-metadata" file:file completionHandler:^(NSError *error) {
+        if(error) {
+            // good
+            XCTFail(@"expected a failure");
+            
         }
         else {
             [expectation fulfill];
         }
     }];
-    [self waitForExpectationsWithTimeout:2.0 handler:nil];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
 }
 
-- (void)testGetPetByTags {
-    XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetByTags"];
-    [api findPetsByTagsWithCompletionBlock:@"tag1,tag2" completionHandler:^(NSArray *output, NSError *error) {
-        if(error){
-            XCTFail(@"got error %@", error);
+- (void)TestUploadWithoutFile {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"testUploadWithoutFile"];
+    
+    [api uploadFileWithCompletionBlock:@1 additionalMetadata:@"special-metadata" file:nil completionHandler:^(NSError *error) {
+        if(error) {
+            XCTFail(@"failed to upload");
+            
         }
-        if(output){
-            for(SWGPet * pet in output) {
-                bool hasTag = false;
-                for(SWGTag * tag in [pet tags]){
-                    if([[tag name] isEqualToString:@"tag1"] || [[tag name] isEqualToString:@"tag2"])
-                        hasTag = true;
-                }
-                if(!hasTag)
-                    XCTFail(@"failed to find tag in pet");
-            }
+        else {
+            [expectation fulfill];
         }
-        [expectation fulfill];
     }];
-    [self waitForExpectationsWithTimeout:2.0 handler:nil];
+    [self waitForExpectationsWithTimeout:10.0 handler:nil];
 }
-@end
\ No newline at end of file
+
+- (SWGPet*) createPet {
+    SWGPet * pet = [[SWGPet alloc] init];
+    pet._id = [[NSNumber alloc] initWithLong:[[NSDate date] timeIntervalSince1970]];
+    pet.name = @"monkey";
+    SWGCategory * category = [[SWGCategory alloc] init];
+    category.name = @"super-happy";
+
+    pet.category = category;
+    pet.status = @"available";
+
+    NSArray * photos = [[NSArray alloc] initWithObjects:@"http://foo.bar.com/3", @"http://foo.bar.com/4", nil];
+    pet.photoUrls = photos;
+    return pet;
+}
+@end
diff --git a/samples/client/petstore/objc/Podfile b/samples/client/petstore/objc/Podfile
index 08674feba4c..925e26812b9 100644
--- a/samples/client/petstore/objc/Podfile
+++ b/samples/client/petstore/objc/Podfile
@@ -1,3 +1,4 @@
 platform :ios, '6.0'
 xcodeproj 'PetstoreClient/PetstoreClient.xcodeproj'
 pod 'AFNetworking', '~> 2.1'
+pod 'JSONModel', '~> 1.0'
diff --git a/samples/client/petstore/objc/Podfile.lock b/samples/client/petstore/objc/Podfile.lock
index ed27b0f2376..de949a0e238 100644
--- a/samples/client/petstore/objc/Podfile.lock
+++ b/samples/client/petstore/objc/Podfile.lock
@@ -20,11 +20,14 @@ PODS:
   - AFNetworking/UIKit (2.5.1):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
+  - JSONModel (1.0.2)
 
 DEPENDENCIES:
   - AFNetworking (~> 2.1)
+  - JSONModel (~> 1.0)
 
 SPEC CHECKSUMS:
-  AFNetworking: 8bee59492a6ff15d69130efa4d0dc67e0094a52a
+  AFNetworking: 10e85a00bb0f475124e4ff2677bf15693b2c1523
+  JSONModel: 6ffcb4ffa3659c9e9a2e5d45d6c7705bab187c03
 
 COCOAPODS: 0.36.0
diff --git a/samples/client/petstore/objc/client/SWGApiClient.m b/samples/client/petstore/objc/client/SWGApiClient.m
index ff454970cf0..6942a21c738 100644
--- a/samples/client/petstore/objc/client/SWGApiClient.m
+++ b/samples/client/petstore/objc/client/SWGApiClient.m
@@ -1,5 +1,6 @@
 #import "SWGApiClient.h"
 #import "SWGFile.h"
+#import "SWGQueryParamCollection.h"
 
 @implementation SWGApiClient
 
@@ -30,13 +31,13 @@ static bool loggingEnabled = true;
                                       diskSize: (unsigned long) diskSize {
     NSAssert(memorySize > 0, @"invalid in-memory cache size");
     NSAssert(diskSize >= 0, @"invalid disk cache size");
-    
+
     NSURLCache *cache =
     [[NSURLCache alloc]
      initWithMemoryCapacity:memorySize
      diskCapacity:diskSize
      diskPath:@"swagger_url_cache"];
-    
+
     [NSURLCache setSharedURLCache:cache];
 }
 
@@ -53,17 +54,17 @@ static bool loggingEnabled = true;
         // setup static vars
         // create queue
         sharedQueue = [[NSOperationQueue alloc] init];
-        
+
         // create pool
         _pool = [[NSMutableDictionary alloc] init];
-        
+
         // initialize URL cache
         [SWGApiClient configureCacheWithMemoryAndDiskCapacity:4*1024*1024 diskSize:32*1024*1024];
-        
+
         // configure reachability
         [SWGApiClient configureCacheReachibilityForHost:baseUrl];
     }
-    
+
     @synchronized(self) {
         SWGApiClient * client = [_pool objectForKey:baseUrl];
         if (client == nil) {
@@ -127,7 +128,7 @@ static bool loggingEnabled = true;
             return TRUE;
         else return FALSE;
     }];
-    
+
     if(matchingItems.count == 1) {
         if(loggingEnabled)
             NSLog(@"removing request id %@", requestId);
@@ -168,19 +169,19 @@ static bool loggingEnabled = true;
                     NSLog(@"reachability changed to AFNetworkReachabilityStatusUnknown");
                 [SWGApiClient setOfflineState:true];
                 break;
-                
+
             case AFNetworkReachabilityStatusNotReachable:
                 if(loggingEnabled)
                     NSLog(@"reachability changed to AFNetworkReachabilityStatusNotReachable");
                 [SWGApiClient setOfflineState:true];
                 break;
-                
+
             case AFNetworkReachabilityStatusReachableViaWWAN:
                 if(loggingEnabled)
                     NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWWAN");
                 [SWGApiClient setOfflineState:false];
                 break;
-                
+
             case AFNetworkReachabilityStatusReachableViaWiFi:
                 if(loggingEnabled)
                     NSLog(@"reachability changed to AFNetworkReachabilityStatusReachableViaWiFi");
@@ -201,21 +202,52 @@ static bool loggingEnabled = true;
                              queryParams:(NSDictionary*) queryParams {
     NSString * separator = nil;
     int counter = 0;
-    
+
     NSMutableString * requestUrl = [NSMutableString stringWithFormat:@"%@", path];
     if(queryParams != nil){
         for(NSString * key in [queryParams keyEnumerator]){
             if(counter == 0) separator = @"?";
             else separator = @"&";
             NSString * value;
-            if([[queryParams valueForKey:key] isKindOfClass:[NSString class]]){
-                value = [SWGApiClient escape:[queryParams valueForKey:key]];
+            id queryParam = [queryParams valueForKey:key];
+            if([queryParam isKindOfClass:[NSString class]]){
+                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                                          [SWGApiClient escape:key], [SWGApiClient escape:[queryParams valueForKey:key]]]];
+            }
+            else if([queryParam isKindOfClass:[SWGQueryParamCollection class]]){
+                SWGQueryParamCollection * coll = (SWGQueryParamCollection*) queryParam;
+                NSArray* values = [coll values];
+                NSString* format = [coll format];
+
+                if([format isEqualToString:@"csv"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@","]]]];
+
+                }
+                else if([format isEqualToString:@"tsv"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"\t"]]]];
+
+                }
+                else if([format isEqualToString:@"pipes"]) {
+                    [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                        [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [values componentsJoinedByString:@"|"]]]];
+
+                }
+                else if([format isEqualToString:@"multi"]) {
+                    for(id obj in values) {
+                        [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                            [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", obj]]];
+                        counter += 1;
+                    }
+
+                }
             }
             else {
-                value = [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]];
+                [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
+                                          [SWGApiClient escape:key], [NSString stringWithFormat:@"%@", [queryParams valueForKey:key]]]];
             }
-            [requestUrl appendString:[NSString stringWithFormat:@"%@%@=%@", separator,
-                                      [SWGApiClient escape:key], value]];
+
             counter += 1;
         }
     }
@@ -242,7 +274,28 @@ static bool loggingEnabled = true;
       requestContentType: (NSString*) requestContentType
      responseContentType: (NSString*) responseContentType
          completionBlock: (void (^)(NSDictionary*, NSError *))completionBlock {
-    
+    // setting request serializer
+    if ([requestContentType isEqualToString:@"application/json"]) {
+        self.requestSerializer = [AFJSONRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else {
+        NSAssert(false, @"unsupport request type %@", requestContentType);
+    }
+
+    // setting response serializer
+    if ([responseContentType isEqualToString:@"application/json"]) {
+        self.responseSerializer = [AFJSONResponseSerializer serializer];
+    }
+    else {
+        self.responseSerializer = [AFHTTPResponseSerializer serializer];
+    }
+
     NSMutableURLRequest * request = nil;
     if (body != nil && [body isKindOfClass:[NSArray class]]){
         SWGFile * file;
@@ -259,8 +312,9 @@ static bool loggingEnabled = true;
             }
         }
         NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-        
-        if(file != nil) {
+
+        // request with multipart form
+        if([requestContentType isEqualToString:@"multipart/form-data"]) {
             request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
                                                                    URLString: urlString
                                                                   parameters: nil
@@ -270,20 +324,32 @@ static bool loggingEnabled = true;
                                                            NSData* data = [params[key] dataUsingEncoding:NSUTF8StringEncoding];
                                                            [formData appendPartWithFormData: data name: key];
                                                        }
-                                                       
-                                                       [formData appendPartWithFileData: [file data]
-                                                                                   name: [file paramName]
-                                                                               fileName: [file name]
-                                                                               mimeType: [file mimeType]];
-                                                       
+
+                                                       if (file) {
+                                                           [formData appendPartWithFileData: [file data]
+                                                                                       name: [file paramName]
+                                                                                   fileName: [file name]
+                                                                                   mimeType: [file mimeType]];
+                                                       }
+
                                                    }
                                                                        error:nil];
         }
+        // request with form parameters or json
+        else {
+            NSString* pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
+            NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
+
+            request = [self.requestSerializer requestWithMethod:method
+                                                      URLString:urlString
+                                                     parameters:params
+                                                          error:nil];
+        }
     }
     else {
         NSString * pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
         NSString * urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
-        
+
         request = [self.requestSerializer requestWithMethod:method
                                                   URLString:urlString
                                                  parameters:body
@@ -305,11 +371,9 @@ static bool loggingEnabled = true;
         [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
     }
 
-    AFJSONRequestSerializer *requestSerializer = [AFJSONRequestSerializer serializer];
-
     if(body != nil) {
         if([body isKindOfClass:[NSDictionary class]] || [body isKindOfClass:[NSArray class]]){
-            [requestSerializer setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
+            [self.requestSerializer setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
         }
         else if ([body isKindOfClass:[SWGFile class]]) {}
         else {
@@ -321,16 +385,16 @@ static bool loggingEnabled = true;
             [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
         }
     }
-    [requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
-    
+    [self.requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
+
     // Always disable cookies!
     [request setHTTPShouldHandleCookies:NO];
-    
-    
+
+
     if (self.logRequests) {
         [self logRequest:request];
     }
-    
+
     NSNumber* requestId = [SWGApiClient queueRequest];
     AFHTTPRequestOperation *op =
     [self HTTPRequestOperationWithRequest:request
@@ -348,14 +412,14 @@ static bool loggingEnabled = true;
                  userInfo[SWGResponseObjectErrorKey] = operation.responseObject;
              }
              NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
-             
+
              if(self.logServerResponses)
                  [self logResponse:nil forRequest:request error:augmentedError];
              completionBlock(nil, augmentedError);
          }
      }
      ];
-    
+
     [self.operationQueue addOperation:op];
     return requestId;
 }
@@ -368,6 +432,28 @@ static bool loggingEnabled = true;
                      requestContentType: (NSString*) requestContentType
                     responseContentType: (NSString*) responseContentType
                         completionBlock: (void (^)(NSString*, NSError *))completionBlock {
+    // setting request serializer
+    if ([requestContentType isEqualToString:@"application/json"]) {
+        self.requestSerializer = [AFJSONRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"application/x-www-form-urlencoded"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else if ([requestContentType isEqualToString:@"multipart/form-data"]) {
+        self.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
+    else {
+        NSAssert(false, @"unsupport request type %@", requestContentType);
+    }
+
+    // setting response serializer
+    if ([responseContentType isEqualToString:@"application/json"]) {
+        self.responseSerializer = [AFJSONResponseSerializer serializer];
+    }
+    else {
+        self.responseSerializer = [AFHTTPResponseSerializer serializer];
+    }
+
     NSMutableURLRequest * request = nil;
     if (body != nil && [body isKindOfClass:[NSArray class]]){
         SWGFile * file;
@@ -384,31 +470,45 @@ static bool loggingEnabled = true;
             }
         }
         NSString * urlString = [[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString];
-        
-        if(file != nil) {
+
+        // request with multipart form
+        if([requestContentType isEqualToString:@"multipart/form-data"]) {
             request = [self.requestSerializer multipartFormRequestWithMethod: @"POST"
                                                                    URLString: urlString
                                                                   parameters: nil
                                                    constructingBodyWithBlock: ^(id<AFMultipartFormData> formData) {
-                                                       
+
                                                        for(NSString * key in params) {
                                                            NSData* data = [params[key] dataUsingEncoding:NSUTF8StringEncoding];
                                                            [formData appendPartWithFormData: data name: key];
                                                        }
-                                                       
-                                                       [formData appendPartWithFileData: [file data]
-                                                                                   name: [file paramName]
-                                                                               fileName: [file name]
-                                                                               mimeType: [file mimeType]];
-                                                       
+
+                                                       if (file) {
+                                                           [formData appendPartWithFileData: [file data]
+                                                                                       name: [file paramName]
+                                                                                   fileName: [file name]
+                                                                                   mimeType: [file mimeType]];
+                                                       }
+
                                                    }
                                                                        error:nil];
         }
+        // request with form parameters or json
+        else {
+            NSString* pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
+            NSString* urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
+
+            request = [self.requestSerializer requestWithMethod:method
+                                                      URLString:urlString
+                                                     parameters:params
+                                                          error:nil];
+        }
+
     }
     else {
         NSString * pathWithQueryParams = [self pathWithQueryParamsToString:path queryParams:queryParams];
         NSString * urlString = [[NSURL URLWithString:pathWithQueryParams relativeToURL:self.baseURL] absoluteString];
-        
+
         request = [self.requestSerializer requestWithMethod: method
                                                   URLString: urlString
                                                  parameters: body
@@ -429,13 +529,11 @@ static bool loggingEnabled = true;
         NSLog(@"%@ cache disabled", path);
         [request setCachePolicy:NSURLRequestReloadIgnoringLocalCacheData];
     }
-    
-    
-    AFJSONRequestSerializer *requestSerializer = [AFJSONRequestSerializer serializer];
+
 
     if(body != nil) {
         if([body isKindOfClass:[NSDictionary class]] || [body isKindOfClass:[NSArray class]]){
-            [requestSerializer setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
+            [self.requestSerializer setValue:requestContentType forHTTPHeaderField:@"Content-Type"];
         }
         else if ([body isKindOfClass:[SWGFile class]]){}
         else {
@@ -447,12 +545,12 @@ static bool loggingEnabled = true;
             [request setValue:[headerParams valueForKey:key] forHTTPHeaderField:key];
         }
     }
-    [requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
+    [self.requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
+
 
-    
     // Always disable cookies!
     [request setHTTPShouldHandleCookies:NO];
-    
+
     NSNumber* requestId = [SWGApiClient queueRequest];
     AFHTTPRequestOperation *op = [self HTTPRequestOperationWithRequest:request
      success:^(AFHTTPRequestOperation *operation, id responseObject) {
@@ -470,15 +568,23 @@ static bool loggingEnabled = true;
                  userInfo[SWGResponseObjectErrorKey] = operation.responseObject;
              }
              NSError *augmentedError = [error initWithDomain:error.domain code:error.code userInfo:userInfo];
-             
+
              if(self.logServerResponses)
                  [self logResponse:nil forRequest:request error:augmentedError];
              completionBlock(nil, augmentedError);
          }
      }];
-    
+
     [self.operationQueue addOperation:op];
     return requestId;
 }
 
-@end
\ No newline at end of file
+@end
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/objc/client/SWGCategory.h b/samples/client/petstore/objc/client/SWGCategory.h
index 35c27105172..a2fed79b4a3 100644
--- a/samples/client/petstore/objc/client/SWGCategory.h
+++ b/samples/client/petstore/objc/client/SWGCategory.h
@@ -2,15 +2,14 @@
 #import "SWGObject.h"
 
 
+@protocol SWGCategory
+@end
+  
 @interface SWGCategory : SWGObject
 
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* name;  
-- (id) _id: (NSNumber*) _id     
-    name: (NSString*) name;
-    
 
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
+@property(nonatomic) NSNumber* _id;
+
+@property(nonatomic) NSString* name;
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGCategory.m b/samples/client/petstore/objc/client/SWGCategory.m
index 882d8a34c59..c41f76a5247 100644
--- a/samples/client/petstore/objc/client/SWGCategory.m
+++ b/samples/client/petstore/objc/client/SWGCategory.m
@@ -1,46 +1,22 @@
-#import "SWGDate.h"
 #import "SWGCategory.h"
 
 @implementation SWGCategory
-
--(id)_id: (NSNumber*) _id
-    name: (NSString*) name
-    
+  
++ (JSONKeyMapper *)keyMapper
 {
-    __id = _id;
-    _name = name;
-    
-
-    return self;
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }];
 }
 
--(id) initWithValues:(NSDictionary*)dict
++ (BOOL)propertyIsOptional:(NSString *)propertyName
 {
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _name = dict[@"name"];
-        
-        
-    }
-    return self;
-}
+  NSArray *optionalProperties = @[@"_id", @"name"];
 
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
 }
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGObject.h b/samples/client/petstore/objc/client/SWGObject.h
index 031bae69279..ccec208abc0 100644
--- a/samples/client/petstore/objc/client/SWGObject.h
+++ b/samples/client/petstore/objc/client/SWGObject.h
@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
+#import "JSONModel.h"
 
-@interface SWGObject : NSObject
-- (id) initWithValues:(NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
+@interface SWGObject : JSONModel
 @end
diff --git a/samples/client/petstore/objc/client/SWGObject.m b/samples/client/petstore/objc/client/SWGObject.m
index 9b37b3592b1..1f897ab1d56 100644
--- a/samples/client/petstore/objc/client/SWGObject.m
+++ b/samples/client/petstore/objc/client/SWGObject.m
@@ -1,17 +1,4 @@
 #import "SWGObject.h"
 
 @implementation SWGObject
-
-- (id) initWithValues:(NSDictionary*)dict {
-    return self;
-}
-
-- (NSDictionary*) asDictionary{
-    return [NSDictionary init];
-}
-
-- (NSString*)description {
-    return [NSString stringWithFormat:@"%@ %@", [super description], [self asDictionary]];
-}
-
 @end
diff --git a/samples/client/petstore/objc/client/SWGOrder.h b/samples/client/petstore/objc/client/SWGOrder.h
index feb85e9c54e..2e71906cd53 100644
--- a/samples/client/petstore/objc/client/SWGOrder.h
+++ b/samples/client/petstore/objc/client/SWGOrder.h
@@ -1,25 +1,24 @@
 #import <Foundation/Foundation.h>
 #import "SWGObject.h"
-#import "SWGDate.h"
 
 
+@protocol SWGOrder
+@end
+  
 @interface SWGOrder : SWGObject
 
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSNumber* petId;  
-@property(nonatomic) NSNumber* quantity;  
-@property(nonatomic) SWGDate* shipDate;  
-@property(nonatomic) NSString* status;  /* Order Status  */
-@property(nonatomic) NSNumber* complete;  
-- (id) _id: (NSNumber*) _id     
-    petId: (NSNumber*) petId     
-    quantity: (NSNumber*) quantity     
-    shipDate: (SWGDate*) shipDate     
-    status: (NSString*) status     
-    complete: (NSNumber*) complete;
-    
 
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
+@property(nonatomic) NSNumber* _id;
+
+@property(nonatomic) NSNumber* petId;
+
+@property(nonatomic) NSNumber* quantity;
+
+@property(nonatomic) NSDate* shipDate;
+/* Order Status [optional]
+ */
+@property(nonatomic) NSString* status;
+
+@property(nonatomic) NSNumber* complete;
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGOrder.m b/samples/client/petstore/objc/client/SWGOrder.m
index d2147a7b1c3..5d3179446ed 100644
--- a/samples/client/petstore/objc/client/SWGOrder.m
+++ b/samples/client/petstore/objc/client/SWGOrder.m
@@ -1,103 +1,22 @@
-#import "SWGDate.h"
 #import "SWGOrder.h"
 
 @implementation SWGOrder
-
--(id)_id: (NSNumber*) _id
-    petId: (NSNumber*) petId
-    quantity: (NSNumber*) quantity
-    shipDate: (SWGDate*) shipDate
-    status: (NSString*) status
-    complete: (NSNumber*) complete
-    
+  
++ (JSONKeyMapper *)keyMapper
 {
-    __id = _id;
-    _petId = petId;
-    _quantity = quantity;
-    _shipDate = shipDate;
-    _status = status;
-    _complete = complete;
-    
-
-    return self;
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"petId": @"petId", @"quantity": @"quantity", @"shipDate": @"shipDate", @"status": @"status", @"complete": @"complete" }];
 }
 
--(id) initWithValues:(NSDictionary*)dict
++ (BOOL)propertyIsOptional:(NSString *)propertyName
 {
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _petId = dict[@"petId"];
-        
-        _quantity = dict[@"quantity"];
-        
-        
-        
-        id shipDate_dict = dict[@"shipDate"];
-        
-        if(shipDate_dict != nil)
-            _shipDate = [[SWGDate  alloc]initWithValues:shipDate_dict];
-        
-        
-        _status = dict[@"status"];
-        
-        _complete = dict[@"complete"];
-        
-        
-    }
-    return self;
-}
+  NSArray *optionalProperties = @[@"_id", @"petId", @"quantity", @"shipDate", @"status", @"complete"];
 
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_petId != nil) dict[@"petId"] = _petId ;
-        
-    
-    
-            if(_quantity != nil) dict[@"quantity"] = _quantity ;
-        
-    
-    
-    if(_shipDate != nil){
-        if([_shipDate isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGDate *shipDate in (NSArray*)_shipDate) {
-                [array addObject:[(SWGObject*)shipDate asDictionary]];
-            }
-            dict[@"shipDate"] = array;
-        }
-        else if(_shipDate && [_shipDate isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_shipDate toString];
-            if(dateString){
-                dict[@"shipDate"] = dateString;
-            }
-        }
-        else {
-        
-            if(_shipDate != nil) dict[@"shipDate"] = [(SWGObject*)_shipDate asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_status != nil) dict[@"status"] = _status ;
-        
-    
-    
-            if(_complete != nil) dict[@"complete"] = _complete ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
 }
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGPet.h b/samples/client/petstore/objc/client/SWGPet.h
index f16fa74cf1e..edd54e9f31a 100644
--- a/samples/client/petstore/objc/client/SWGPet.h
+++ b/samples/client/petstore/objc/client/SWGPet.h
@@ -4,23 +4,23 @@
 #import "SWGCategory.h"
 
 
+@protocol SWGPet
+@end
+  
 @interface SWGPet : SWGObject
 
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) SWGCategory* category;  
-@property(nonatomic) NSString* name;  
-@property(nonatomic) NSArray* photoUrls;  
-@property(nonatomic) NSArray* tags;  
-@property(nonatomic) NSString* status;  /* pet status in the store  */
-- (id) _id: (NSNumber*) _id     
-    category: (SWGCategory*) category     
-    name: (NSString*) name     
-    photoUrls: (NSArray*) photoUrls     
-    tags: (NSArray*) tags     
-    status: (NSString*) status;
-    
 
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
+@property(nonatomic) NSNumber* _id;
+
+@property(nonatomic) SWGCategory* category;
+
+@property(nonatomic) NSString* name;
+
+@property(nonatomic) NSArray* photoUrls;
+
+@property(nonatomic) NSArray<SWGTag>* tags;
+/* pet status in the store [optional]
+ */
+@property(nonatomic) NSString* status;
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGPet.m b/samples/client/petstore/objc/client/SWGPet.m
index 4a863a7e1fd..d5559aa6f72 100644
--- a/samples/client/petstore/objc/client/SWGPet.m
+++ b/samples/client/petstore/objc/client/SWGPet.m
@@ -1,141 +1,22 @@
-#import "SWGDate.h"
 #import "SWGPet.h"
 
 @implementation SWGPet
-
--(id)_id: (NSNumber*) _id
-    category: (SWGCategory*) category
-    name: (NSString*) name
-    photoUrls: (NSArray*) photoUrls
-    tags: (NSArray*) tags
-    status: (NSString*) status
-    
+  
++ (JSONKeyMapper *)keyMapper
 {
-    __id = _id;
-    _category = category;
-    _name = name;
-    _photoUrls = photoUrls;
-    _tags = tags;
-    _status = status;
-    
-
-    return self;
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"category": @"category", @"name": @"name", @"photoUrls": @"photoUrls", @"tags": @"tags", @"status": @"status" }];
 }
 
--(id) initWithValues:(NSDictionary*)dict
++ (BOOL)propertyIsOptional:(NSString *)propertyName
 {
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        
-        
-        id category_dict = dict[@"category"];
-        
-        if(category_dict != nil)
-            _category = [[SWGCategory  alloc]initWithValues:category_dict];
-        
-        
-        _name = dict[@"name"];
-        
-        _photoUrls = dict[@"photoUrls"];
-        
-        
-        
-        id tags_dict = dict[@"tags"];
-        
-        if([tags_dict isKindOfClass:[NSArray class]]) {
-            NSMutableArray * objs = [[NSMutableArray alloc] initWithCapacity:[(NSArray*)tags_dict count]];
-            if([(NSArray*)tags_dict count] > 0) {
-                for (NSDictionary* dict in (NSArray*)tags_dict) {
-                    SWGTag* d = [[SWGTag alloc] initWithValues:dict];
-                    [objs addObject:d];
-                }
-                _tags = [[NSArray alloc] initWithArray:objs];
-            }
-            else
-                _tags = [[NSArray alloc] init];
-        }
-        else {
-            _tags = [[NSArray alloc] init];
-        }
-        
-        
-        _status = dict[@"status"];
-        
-        
-    }
-    return self;
-}
+  NSArray *optionalProperties = @[@"_id", @"category", @"tags", @"status"];
 
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-    if(_category != nil){
-        if([_category isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGCategory *category in (NSArray*)_category) {
-                [array addObject:[(SWGObject*)category asDictionary]];
-            }
-            dict[@"category"] = array;
-        }
-        else if(_category && [_category isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_category toString];
-            if(dateString){
-                dict[@"category"] = dateString;
-            }
-        }
-        else {
-        
-            if(_category != nil) dict[@"category"] = [(SWGObject*)_category asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-    
-            if(_photoUrls != nil) dict[@"photoUrls"] = _photoUrls ;
-        
-    
-    
-    if(_tags != nil){
-        if([_tags isKindOfClass:[NSArray class]]){
-            NSMutableArray * array = [[NSMutableArray alloc] init];
-            for( SWGTag *tags in (NSArray*)_tags) {
-                [array addObject:[(SWGObject*)tags asDictionary]];
-            }
-            dict[@"tags"] = array;
-        }
-        else if(_tags && [_tags isKindOfClass:[SWGDate class]]) {
-            NSString * dateString = [(SWGDate*)_tags toString];
-            if(dateString){
-                dict[@"tags"] = dateString;
-            }
-        }
-        else {
-        
-            if(_tags != nil) dict[@"tags"] = [(SWGObject*)_tags asDictionary];
-        
-        }
-    }
-    
-    
-    
-            if(_status != nil) dict[@"status"] = _status ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
 }
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGPetApi.h b/samples/client/petstore/objc/client/SWGPetApi.h
index b40a210ea4c..40d475d5e0a 100644
--- a/samples/client/petstore/objc/client/SWGPetApi.h
+++ b/samples/client/petstore/objc/client/SWGPetApi.h
@@ -15,10 +15,7 @@
 
  Update an existing pet
  
- 
- 
 
- 
  @param body Pet object that needs to be added to the store
  
 
@@ -34,10 +31,7 @@
 
  Add a new pet to the store
  
- 
- 
 
- 
  @param body Pet object that needs to be added to the store
  
 
@@ -52,49 +46,40 @@
 /**
 
  Finds Pets by status
- 
  Multiple status values can be provided with comma seperated strings
- 
 
- 
  @param status Status values that need to be considered for filter
  
 
- return type: NSArray*
+ return type: NSArray<SWGPet>*
  */
 -(NSNumber*) findPetsByStatusWithCompletionBlock :(NSArray*) status 
     
-    completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
+    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock;
     
 
 
 /**
 
  Finds Pets by tags
- 
  Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
- 
 
- 
  @param tags Tags to filter by
  
 
- return type: NSArray*
+ return type: NSArray<SWGPet>*
  */
 -(NSNumber*) findPetsByTagsWithCompletionBlock :(NSArray*) tags 
     
-    completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock;
+    completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock;
     
 
 
 /**
 
  Find pet by ID
- 
  Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
- 
 
- 
  @param petId ID of pet that needs to be fetched
  
 
@@ -110,14 +95,9 @@
 
  Updates a pet in the store with form data
  
- 
- 
 
- 
  @param petId ID of pet that needs to be updated
- 
  @param name Updated name of the pet
- 
  @param status Updated status of the pet
  
 
@@ -135,12 +115,8 @@
 
  Deletes a pet
  
- 
- 
 
- 
  @param api_key 
- 
  @param petId Pet id to delete
  
 
@@ -157,14 +133,9 @@
 
  uploads an image
  
- 
- 
 
- 
  @param petId ID of pet to update
- 
  @param additionalMetadata Additional data to pass to server
- 
  @param file file to upload
  
 
diff --git a/samples/client/petstore/objc/client/SWGPetApi.m b/samples/client/petstore/objc/client/SWGPetApi.m
index 5d134bb1f27..dca990cb118 100644
--- a/samples/client/petstore/objc/client/SWGPetApi.m
+++ b/samples/client/petstore/objc/client/SWGPetApi.m
@@ -1,10 +1,14 @@
 #import "SWGPetApi.h"
 #import "SWGFile.h"
+#import "SWGQueryParamCollection.h"
 #import "SWGApiClient.h"
 #import "SWGPet.h"
 #import "SWGFile.h"
 
 
+@interface SWGPetApi ()
+    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
+@end
 
 @implementation SWGPetApi
 static NSString * basePath = @"http://petstore.swagger.io/v2";
@@ -32,18 +36,19 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 }
 
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
+    [self.defaultHeaders setValue:value forKey:key];
 }
 
 -(id) init {
     self = [super init];
+    self.defaultHeaders = [NSMutableDictionary dictionary];
     [self apiClient];
     return self;
 }
 
 -(void) setHeaderValue:(NSString*) value
            forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
+    [self.defaultHeaders setValue:value forKey:key];
 }
 
 -(unsigned long) requestQueueSize {
@@ -51,6 +56,12 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 }
 
 
+/*!
+ * Update an existing pet
+ * 
+ * \param body Pet object that needs to be added to the store
+ * \returns void
+ */
 -(NSNumber*) updatePetWithCompletionBlock: (SWGPet*) body
         
         
@@ -64,12 +75,16 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[@"application/json", @"application/xml", ];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
@@ -79,8 +94,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
@@ -88,8 +103,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
@@ -132,6 +147,12 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Add a new pet to the store
+ * 
+ * \param body Pet object that needs to be added to the store
+ * \returns void
+ */
 -(NSNumber*) addPetWithCompletionBlock: (SWGPet*) body
         
         
@@ -145,12 +166,16 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[@"application/json", @"application/xml", ];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
@@ -160,8 +185,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
@@ -169,8 +194,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
@@ -213,9 +238,15 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Finds Pets by status
+ * Multiple status values can be provided with comma seperated strings
+ * \param status Status values that need to be considered for filter
+ * \returns NSArray<SWGPet>*
+ */
 -(NSNumber*) findPetsByStatusWithCompletionBlock: (NSArray*) status
         
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
+        completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock
          {
 
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByStatus", basePath];
@@ -226,21 +257,29 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(status != nil)
-        queryParams[@"status"] = status;
+    if(status != nil) {
+        
+        queryParams[@"status"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: status format: @"multi"];
+        
+        
+    }
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -270,11 +309,11 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
                     for (NSDictionary* dict in (NSArray*)data) {
                         
                         
-                        SWGPet* d = [[SWGPet alloc]initWithValues: dict];
+                        SWGPet* d = [[SWGPet alloc] initWithDictionary:dict error:nil];
                         
                         [objs addObject:d];
                     }
-                    completionBlock(objs, nil);
+                    completionBlock((NSArray<SWGPet>*)objs, nil);
                 }
                 
                 
@@ -286,9 +325,15 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Finds Pets by tags
+ * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+ * \param tags Tags to filter by
+ * \returns NSArray<SWGPet>*
+ */
 -(NSNumber*) findPetsByTagsWithCompletionBlock: (NSArray*) tags
         
-        completionHandler: (void (^)(NSArray* output, NSError* error))completionBlock
+        completionHandler: (void (^)(NSArray<SWGPet>* output, NSError* error))completionBlock
          {
 
     NSMutableString* requestUrl = [NSMutableString stringWithFormat:@"%@/pet/findByTags", basePath];
@@ -299,21 +344,29 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(tags != nil)
-        queryParams[@"tags"] = tags;
+    if(tags != nil) {
+        
+        queryParams[@"tags"] = [[SWGQueryParamCollection alloc] initWithValuesAndFormat: tags format: @"multi"];
+        
+        
+    }
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -343,11 +396,11 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
                     for (NSDictionary* dict in (NSArray*)data) {
                         
                         
-                        SWGPet* d = [[SWGPet alloc]initWithValues: dict];
+                        SWGPet* d = [[SWGPet alloc] initWithDictionary:dict error:nil];
                         
                         [objs addObject:d];
                     }
-                    completionBlock(objs, nil);
+                    completionBlock((NSArray<SWGPet>*)objs, nil);
                 }
                 
                 
@@ -359,6 +412,12 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Find pet by ID
+ * Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+ * \param petId ID of pet that needs to be fetched
+ * \returns SWGPet*
+ */
 -(NSNumber*) getPetByIdWithCompletionBlock: (NSNumber*) petId
         
         completionHandler: (void (^)(SWGPet* output, NSError* error))completionBlock
@@ -373,19 +432,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -405,10 +468,10 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     // complex response
         
     // comples response type
-    return [client dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
+    return [client dictionary: requestUrl
+                       method: @"GET"
+                  queryParams: queryParams
+                         body: bodyDictionary
                  headerParams: headerParams
            requestContentType: requestContentType
           responseContentType: responseContentType
@@ -420,17 +483,26 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
                 }
                 SWGPet* result = nil;
                 if (data) {
-                    result = [[SWGPet  alloc] initWithValues  : data];
+                    result = [[SWGPet  alloc]  initWithDictionary:data error:nil];
                 }
                 completionBlock(result , nil);
                 
               }];
     
+
     
 
     
 }
 
+/*!
+ * Updates a pet in the store with form data
+ * 
+ * \param petId ID of pet that needs to be updated
+ * \param name Updated name of the pet
+ * \param status Updated status of the pet
+ * \returns void
+ */
 -(NSNumber*) updatePetWithFormWithCompletionBlock: (NSString*) petId
          name: (NSString*) name
          status: (NSString*) status
@@ -447,19 +519,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[@"application/x-www-form-urlencoded", ];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -508,6 +584,13 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Deletes a pet
+ * 
+ * \param api_key 
+ * \param petId Pet id to delete
+ * \returns void
+ */
 -(NSNumber*) deletePetWithCompletionBlock: (NSString*) api_key
          petId: (NSNumber*) petId
         
@@ -523,12 +606,16 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     if(api_key != nil)
         headerParams[@"api_key"] = api_key;
     
@@ -537,7 +624,7 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -570,6 +657,14 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * uploads an image
+ * 
+ * \param petId ID of pet to update
+ * \param additionalMetadata Additional data to pass to server
+ * \param file file to upload
+ * \returns void
+ */
 -(NSNumber*) uploadFileWithCompletionBlock: (NSNumber*) petId
          additionalMetadata: (NSString*) additionalMetadata
          file: (SWGFile*) file
@@ -586,19 +681,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"petId", @"}"]] withString: [SWGApiClient escape:petId]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[@"multipart/form-data", ];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -614,8 +713,10 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     if(bodyDictionary == nil) {
       bodyDictionary = [[NSMutableArray alloc] init];
     }
-    [bodyDictionary addObject:file];
-    file.paramName  = @"file";
+    if(file != nil) {
+      [bodyDictionary addObject:file];
+      file.paramName  = @"file";
+    }
     
     if(bodyDictionary == nil) {
       bodyDictionary = [[NSMutableArray alloc] init];
@@ -654,4 +755,4 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
 
 
-@end
\ No newline at end of file
+@end
diff --git a/samples/client/petstore/objc/client/SWGQueryParamCollection.h b/samples/client/petstore/objc/client/SWGQueryParamCollection.h
new file mode 100644
index 00000000000..3b771881b0f
--- /dev/null
+++ b/samples/client/petstore/objc/client/SWGQueryParamCollection.h
@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+@interface SWGQueryParamCollection : NSObject
+
+@property(nonatomic, readonly) NSArray* values;
+@property(nonatomic, readonly) NSString* format;
+
+- (id) initWithValuesAndFormat: (NSArray*) values
+                        format: (NSString*) format;
+
+@end
diff --git a/samples/client/petstore/objc/client/SWGQueryParamCollection.m b/samples/client/petstore/objc/client/SWGQueryParamCollection.m
new file mode 100644
index 00000000000..9ce319940dd
--- /dev/null
+++ b/samples/client/petstore/objc/client/SWGQueryParamCollection.m
@@ -0,0 +1,16 @@
+#import "SWGQueryParamCollection.h"
+
+@implementation SWGQueryParamCollection
+
+@synthesize values = _values;
+@synthesize format = _format;
+
+- (id) initWithValuesAndFormat: (NSArray*) values
+                        format: (NSString*) format {
+    _values = values;
+    _format = format;
+
+    return self;
+}
+
+@end
\ No newline at end of file
diff --git a/samples/client/petstore/objc/client/SWGStoreApi.h b/samples/client/petstore/objc/client/SWGStoreApi.h
index 2daa1e8656f..b4b8e5af5dc 100644
--- a/samples/client/petstore/objc/client/SWGStoreApi.h
+++ b/samples/client/petstore/objc/client/SWGStoreApi.h
@@ -13,9 +13,7 @@
 /**
 
  Returns pet inventories by status
- 
  Returns a map of status codes to quantities
- 
 
  
 
@@ -30,10 +28,7 @@
 
  Place an order for a pet
  
- 
- 
 
- 
  @param body order placed for purchasing the pet
  
 
@@ -48,11 +43,8 @@
 /**
 
  Find purchase order by ID
- 
  For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
- 
 
- 
  @param orderId ID of pet that needs to be fetched
  
 
@@ -67,11 +59,8 @@
 /**
 
  Delete purchase order by ID
- 
  For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
- 
 
- 
  @param orderId ID of the order that needs to be deleted
  
 
diff --git a/samples/client/petstore/objc/client/SWGStoreApi.m b/samples/client/petstore/objc/client/SWGStoreApi.m
index 3eb015ebc0a..c50cf67c5dc 100644
--- a/samples/client/petstore/objc/client/SWGStoreApi.m
+++ b/samples/client/petstore/objc/client/SWGStoreApi.m
@@ -1,9 +1,13 @@
 #import "SWGStoreApi.h"
 #import "SWGFile.h"
+#import "SWGQueryParamCollection.h"
 #import "SWGApiClient.h"
 #import "SWGOrder.h"
 
 
+@interface SWGStoreApi ()
+    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
+@end
 
 @implementation SWGStoreApi
 static NSString * basePath = @"http://petstore.swagger.io/v2";
@@ -31,18 +35,19 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 }
 
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
+    [self.defaultHeaders setValue:value forKey:key];
 }
 
 -(id) init {
     self = [super init];
+    self.defaultHeaders = [NSMutableDictionary dictionary];
     [self apiClient];
     return self;
 }
 
 -(void) setHeaderValue:(NSString*) value
            forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
+    [self.defaultHeaders setValue:value forKey:key];
 }
 
 -(unsigned long) requestQueueSize {
@@ -50,6 +55,11 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 }
 
 
+/*!
+ * Returns pet inventories by status
+ * Returns a map of status codes to quantities
+ * \returns NSDictionary*
+ */
 -(NSNumber*) getInventoryWithCompletionBlock: 
         (void (^)(NSDictionary* output, NSError* error))completionBlock
          {
@@ -62,19 +72,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -113,6 +127,12 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Place an order for a pet
+ * 
+ * \param body order placed for purchasing the pet
+ * \returns SWGOrder*
+ */
 -(NSNumber*) placeOrderWithCompletionBlock: (SWGOrder*) body
         
         completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock
@@ -126,12 +146,16 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
@@ -141,8 +165,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
@@ -150,8 +174,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
@@ -181,10 +205,10 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     // complex response
         
     // comples response type
-    return [client dictionary: requestUrl 
-                       method: @"POST" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
+    return [client dictionary: requestUrl
+                       method: @"POST"
+                  queryParams: queryParams
+                         body: bodyDictionary
                  headerParams: headerParams
            requestContentType: requestContentType
           responseContentType: responseContentType
@@ -196,17 +220,24 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
                 }
                 SWGOrder* result = nil;
                 if (data) {
-                    result = [[SWGOrder  alloc] initWithValues  : data];
+                    result = [[SWGOrder  alloc]  initWithDictionary:data error:nil];
                 }
                 completionBlock(result , nil);
                 
               }];
     
+
     
 
     
 }
 
+/*!
+ * Find purchase order by ID
+ * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+ * \param orderId ID of pet that needs to be fetched
+ * \returns SWGOrder*
+ */
 -(NSNumber*) getOrderByIdWithCompletionBlock: (NSString*) orderId
         
         completionHandler: (void (^)(SWGOrder* output, NSError* error))completionBlock
@@ -221,19 +252,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [SWGApiClient escape:orderId]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -253,10 +288,10 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     // complex response
         
     // comples response type
-    return [client dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
+    return [client dictionary: requestUrl
+                       method: @"GET"
+                  queryParams: queryParams
+                         body: bodyDictionary
                  headerParams: headerParams
            requestContentType: requestContentType
           responseContentType: responseContentType
@@ -268,17 +303,24 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
                 }
                 SWGOrder* result = nil;
                 if (data) {
-                    result = [[SWGOrder  alloc] initWithValues  : data];
+                    result = [[SWGOrder  alloc]  initWithDictionary:data error:nil];
                 }
                 completionBlock(result , nil);
                 
               }];
     
+
     
 
     
 }
 
+/*!
+ * Delete purchase order by ID
+ * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+ * \param orderId ID of the order that needs to be deleted
+ * \returns void
+ */
 -(NSNumber*) deleteOrderWithCompletionBlock: (NSString*) orderId
         
         
@@ -293,19 +335,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"orderId", @"}"]] withString: [SWGApiClient escape:orderId]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -340,4 +386,4 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
 
 
-@end
\ No newline at end of file
+@end
diff --git a/samples/client/petstore/objc/client/SWGTag.h b/samples/client/petstore/objc/client/SWGTag.h
index 7eb82c7f2bc..d9cc84be270 100644
--- a/samples/client/petstore/objc/client/SWGTag.h
+++ b/samples/client/petstore/objc/client/SWGTag.h
@@ -2,15 +2,14 @@
 #import "SWGObject.h"
 
 
+@protocol SWGTag
+@end
+  
 @interface SWGTag : SWGObject
 
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* name;  
-- (id) _id: (NSNumber*) _id     
-    name: (NSString*) name;
-    
 
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
+@property(nonatomic) NSNumber* _id;
+
+@property(nonatomic) NSString* name;
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGTag.m b/samples/client/petstore/objc/client/SWGTag.m
index bb1ea0262fd..5d48a099070 100644
--- a/samples/client/petstore/objc/client/SWGTag.m
+++ b/samples/client/petstore/objc/client/SWGTag.m
@@ -1,46 +1,22 @@
-#import "SWGDate.h"
 #import "SWGTag.h"
 
 @implementation SWGTag
-
--(id)_id: (NSNumber*) _id
-    name: (NSString*) name
-    
+  
++ (JSONKeyMapper *)keyMapper
 {
-    __id = _id;
-    _name = name;
-    
-
-    return self;
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }];
 }
 
--(id) initWithValues:(NSDictionary*)dict
++ (BOOL)propertyIsOptional:(NSString *)propertyName
 {
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _name = dict[@"name"];
-        
-        
-    }
-    return self;
-}
+  NSArray *optionalProperties = @[@"_id", @"name"];
 
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_name != nil) dict[@"name"] = _name ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
 }
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGUser.h b/samples/client/petstore/objc/client/SWGUser.h
index 938f2775c5e..f505ca2c041 100644
--- a/samples/client/petstore/objc/client/SWGUser.h
+++ b/samples/client/petstore/objc/client/SWGUser.h
@@ -2,27 +2,27 @@
 #import "SWGObject.h"
 
 
+@protocol SWGUser
+@end
+  
 @interface SWGUser : SWGObject
 
-@property(nonatomic) NSNumber* _id;  
-@property(nonatomic) NSString* username;  
-@property(nonatomic) NSString* firstName;  
-@property(nonatomic) NSString* lastName;  
-@property(nonatomic) NSString* email;  
-@property(nonatomic) NSString* password;  
-@property(nonatomic) NSString* phone;  
-@property(nonatomic) NSNumber* userStatus;  /* User Status  */
-- (id) _id: (NSNumber*) _id     
-    username: (NSString*) username     
-    firstName: (NSString*) firstName     
-    lastName: (NSString*) lastName     
-    email: (NSString*) email     
-    password: (NSString*) password     
-    phone: (NSString*) phone     
-    userStatus: (NSNumber*) userStatus;
-    
 
-- (id) initWithValues: (NSDictionary*)dict;
-- (NSDictionary*) asDictionary;
+@property(nonatomic) NSNumber* _id;
+
+@property(nonatomic) NSString* username;
+
+@property(nonatomic) NSString* firstName;
+
+@property(nonatomic) NSString* lastName;
+
+@property(nonatomic) NSString* email;
+
+@property(nonatomic) NSString* password;
+
+@property(nonatomic) NSString* phone;
+/* User Status [optional]
+ */
+@property(nonatomic) NSNumber* userStatus;
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGUser.m b/samples/client/petstore/objc/client/SWGUser.m
index a4121f6ec5c..060b65ffa12 100644
--- a/samples/client/petstore/objc/client/SWGUser.m
+++ b/samples/client/petstore/objc/client/SWGUser.m
@@ -1,94 +1,22 @@
-#import "SWGDate.h"
 #import "SWGUser.h"
 
 @implementation SWGUser
-
--(id)_id: (NSNumber*) _id
-    username: (NSString*) username
-    firstName: (NSString*) firstName
-    lastName: (NSString*) lastName
-    email: (NSString*) email
-    password: (NSString*) password
-    phone: (NSString*) phone
-    userStatus: (NSNumber*) userStatus
-    
+  
++ (JSONKeyMapper *)keyMapper
 {
-    __id = _id;
-    _username = username;
-    _firstName = firstName;
-    _lastName = lastName;
-    _email = email;
-    _password = password;
-    _phone = phone;
-    _userStatus = userStatus;
-    
-
-    return self;
+  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"username": @"username", @"firstName": @"firstName", @"lastName": @"lastName", @"email": @"email", @"password": @"password", @"phone": @"phone", @"userStatus": @"userStatus" }];
 }
 
--(id) initWithValues:(NSDictionary*)dict
++ (BOOL)propertyIsOptional:(NSString *)propertyName
 {
-    self = [super init];
-    if(self) {
-        __id = dict[@"id"];
-        
-        _username = dict[@"username"];
-        
-        _firstName = dict[@"firstName"];
-        
-        _lastName = dict[@"lastName"];
-        
-        _email = dict[@"email"];
-        
-        _password = dict[@"password"];
-        
-        _phone = dict[@"phone"];
-        
-        _userStatus = dict[@"userStatus"];
-        
-        
-    }
-    return self;
-}
+  NSArray *optionalProperties = @[@"_id", @"username", @"firstName", @"lastName", @"email", @"password", @"phone", @"userStatus"];
 
--(NSDictionary*) asDictionary {
-    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    
-            if(__id != nil) dict[@"id"] = __id ;
-        
-    
-    
-            if(_username != nil) dict[@"username"] = _username ;
-        
-    
-    
-            if(_firstName != nil) dict[@"firstName"] = _firstName ;
-        
-    
-    
-            if(_lastName != nil) dict[@"lastName"] = _lastName ;
-        
-    
-    
-            if(_email != nil) dict[@"email"] = _email ;
-        
-    
-    
-            if(_password != nil) dict[@"password"] = _password ;
-        
-    
-    
-            if(_phone != nil) dict[@"phone"] = _phone ;
-        
-    
-    
-            if(_userStatus != nil) dict[@"userStatus"] = _userStatus ;
-        
-    
-
-    NSDictionary* output = [dict copy];
-    return output;
+  if ([optionalProperties containsObject:propertyName]) {
+    return YES;
+  }
+  else {
+    return NO;
+  }
 }
 
 @end
diff --git a/samples/client/petstore/objc/client/SWGUserApi.h b/samples/client/petstore/objc/client/SWGUserApi.h
index 14d08208f83..47a5dd95e09 100644
--- a/samples/client/petstore/objc/client/SWGUserApi.h
+++ b/samples/client/petstore/objc/client/SWGUserApi.h
@@ -13,11 +13,8 @@
 /**
 
  Create user
- 
  This can only be done by the logged in user.
- 
 
- 
  @param body Created user object
  
 
@@ -33,16 +30,13 @@
 
  Creates list of users with given input array
  
- 
- 
 
- 
  @param body List of user object
  
 
  return type: 
  */
--(NSNumber*) createUsersWithArrayInputWithCompletionBlock :(NSArray*) body 
+-(NSNumber*) createUsersWithArrayInputWithCompletionBlock :(NSArray<SWGUser>*) body 
     
     
     completionHandler: (void (^)(NSError* error))completionBlock;
@@ -52,16 +46,13 @@
 
  Creates list of users with given input array
  
- 
- 
 
- 
  @param body List of user object
  
 
  return type: 
  */
--(NSNumber*) createUsersWithListInputWithCompletionBlock :(NSArray*) body 
+-(NSNumber*) createUsersWithListInputWithCompletionBlock :(NSArray<SWGUser>*) body 
     
     
     completionHandler: (void (^)(NSError* error))completionBlock;
@@ -71,12 +62,8 @@
 
  Logs user into the system
  
- 
- 
 
- 
  @param username The user name for login
- 
  @param password The password for login in clear text
  
 
@@ -93,8 +80,6 @@
 
  Logs out current logged in user session
  
- 
- 
 
  
 
@@ -109,10 +94,7 @@
 
  Get user by user name
  
- 
- 
 
- 
  @param username The name that needs to be fetched. Use user1 for testing. 
  
 
@@ -127,13 +109,9 @@
 /**
 
  Updated user
- 
  This can only be done by the logged in user.
- 
 
- 
  @param username name that need to be deleted
- 
  @param body Updated user object
  
 
@@ -149,11 +127,8 @@
 /**
 
  Delete user
- 
  This can only be done by the logged in user.
- 
 
- 
  @param username The name that needs to be deleted
  
 
diff --git a/samples/client/petstore/objc/client/SWGUserApi.m b/samples/client/petstore/objc/client/SWGUserApi.m
index 6e33862d111..1316cebd07c 100644
--- a/samples/client/petstore/objc/client/SWGUserApi.m
+++ b/samples/client/petstore/objc/client/SWGUserApi.m
@@ -1,9 +1,13 @@
 #import "SWGUserApi.h"
 #import "SWGFile.h"
+#import "SWGQueryParamCollection.h"
 #import "SWGApiClient.h"
 #import "SWGUser.h"
 
 
+@interface SWGUserApi ()
+    @property (readwrite, nonatomic, strong) NSMutableDictionary *defaultHeaders;
+@end
 
 @implementation SWGUserApi
 static NSString * basePath = @"http://petstore.swagger.io/v2";
@@ -31,18 +35,19 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 }
 
 -(void) addHeader:(NSString*)value forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
+    [self.defaultHeaders setValue:value forKey:key];
 }
 
 -(id) init {
     self = [super init];
+    self.defaultHeaders = [NSMutableDictionary dictionary];
     [self apiClient];
     return self;
 }
 
 -(void) setHeaderValue:(NSString*) value
            forKey:(NSString*)key {
-    [[self apiClient] setHeaderValue:value forKey:key];
+    [self.defaultHeaders setValue:value forKey:key];
 }
 
 -(unsigned long) requestQueueSize {
@@ -50,6 +55,12 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 }
 
 
+/*!
+ * Create user
+ * This can only be done by the logged in user.
+ * \param body Created user object
+ * \returns void
+ */
 -(NSNumber*) createUserWithCompletionBlock: (SWGUser*) body
         
         
@@ -63,12 +74,16 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
@@ -78,8 +93,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
@@ -87,8 +102,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
@@ -131,7 +146,13 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
--(NSNumber*) createUsersWithArrayInputWithCompletionBlock: (NSArray*) body
+/*!
+ * Creates list of users with given input array
+ * 
+ * \param body List of user object
+ * \returns void
+ */
+-(NSNumber*) createUsersWithArrayInputWithCompletionBlock: (NSArray<SWGUser>*) body
         
         
         completionHandler: (void (^)(NSError* error))completionBlock {
@@ -144,12 +165,16 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
@@ -159,8 +184,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
@@ -168,8 +193,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
@@ -212,7 +237,13 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
--(NSNumber*) createUsersWithListInputWithCompletionBlock: (NSArray*) body
+/*!
+ * Creates list of users with given input array
+ * 
+ * \param body List of user object
+ * \returns void
+ */
+-(NSNumber*) createUsersWithListInputWithCompletionBlock: (NSArray<SWGUser>*) body
         
         
         completionHandler: (void (^)(NSError* error))completionBlock {
@@ -225,12 +256,16 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
@@ -240,8 +275,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
@@ -249,8 +284,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
@@ -293,6 +328,13 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Logs user into the system
+ * 
+ * \param username The user name for login
+ * \param password The password for login in clear text
+ * \returns NSString*
+ */
 -(NSNumber*) loginUserWithCompletionBlock: (NSString*) username
          password: (NSString*) password
         
@@ -307,23 +349,31 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
-    if(username != nil)
+    if(username != nil) {
+        
         queryParams[@"username"] = username;
-    if(password != nil)
+    }
+    if(password != nil) {
+        
         queryParams[@"password"] = password;
+    }
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -362,11 +412,17 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
     // complex response
         
+
     
 
     
 }
 
+/*!
+ * Logs out current logged in user session
+ * 
+ * \returns void
+ */
 -(NSNumber*) logoutUserWithCompletionBlock: 
         
         (void (^)(NSError* error))completionBlock {
@@ -379,19 +435,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -424,6 +484,12 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Get user by user name
+ * 
+ * \param username The name that needs to be fetched. Use user1 for testing. 
+ * \returns SWGUser*
+ */
 -(NSNumber*) getUserByNameWithCompletionBlock: (NSString*) username
         
         completionHandler: (void (^)(SWGUser* output, NSError* error))completionBlock
@@ -438,19 +504,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -470,10 +540,10 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     // complex response
         
     // comples response type
-    return [client dictionary: requestUrl 
-                       method: @"GET" 
-                  queryParams: queryParams 
-                         body: bodyDictionary 
+    return [client dictionary: requestUrl
+                       method: @"GET"
+                  queryParams: queryParams
+                         body: bodyDictionary
                  headerParams: headerParams
            requestContentType: requestContentType
           responseContentType: responseContentType
@@ -485,17 +555,25 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
                 }
                 SWGUser* result = nil;
                 if (data) {
-                    result = [[SWGUser  alloc] initWithValues  : data];
+                    result = [[SWGUser  alloc]  initWithDictionary:data error:nil];
                 }
                 completionBlock(result , nil);
                 
               }];
     
+
     
 
     
 }
 
+/*!
+ * Updated user
+ * This can only be done by the logged in user.
+ * \param username name that need to be deleted
+ * \param body Updated user object
+ * \returns void
+ */
 -(NSNumber*) updateUserWithCompletionBlock: (NSString*) username
          body: (SWGUser*) body
         
@@ -511,12 +589,16 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
@@ -526,8 +608,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     if(__body != nil && [__body isKindOfClass:[NSArray class]]){
         NSMutableArray * objs = [[NSMutableArray alloc] init];
         for (id dict in (NSArray*)__body) {
-            if([dict respondsToSelector:@selector(asDictionary)]) {
-                [objs addObject:[(SWGObject*)dict asDictionary]];
+            if([dict respondsToSelector:@selector(toDictionary)]) {
+                [objs addObject:[(SWGObject*)dict toDictionary]];
             }
             else{
                 [objs addObject:dict];
@@ -535,8 +617,8 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
         }
         bodyDictionary = objs;
     }
-    else if([__body respondsToSelector:@selector(asDictionary)]) {
-        bodyDictionary = [(SWGObject*)__body asDictionary];
+    else if([__body respondsToSelector:@selector(toDictionary)]) {
+        bodyDictionary = [(SWGObject*)__body toDictionary];
     }
     else if([__body isKindOfClass:[NSString class]]) {
         // convert it to a dictionary
@@ -579,6 +661,12 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     
 }
 
+/*!
+ * Delete user
+ * This can only be done by the logged in user.
+ * \param username The name that needs to be deleted
+ * \returns void
+ */
 -(NSNumber*) deleteUserWithCompletionBlock: (NSString*) username
         
         
@@ -593,19 +681,23 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
     [requestUrl replaceCharactersInRange: [requestUrl rangeOfString:[NSString stringWithFormat:@"%@%@%@", @"{", @"username", @"}"]] withString: [SWGApiClient escape:username]];
     
 
-    NSString* requestContentType = @"application/json";
-    NSString* responseContentType = @"application/json";
+    NSArray* requestContentTypes = @[];
+    NSString* requestContentType = [requestContentTypes count] > 0 ? requestContentTypes[0] : @"application/json";
+
+    NSArray* responseContentTypes = @[@"application/json", @"application/xml"];
+    NSString* responseContentType = [responseContentTypes count] > 0 ? responseContentTypes[0] : @"application/json";
 
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     
-    NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary* headerParams = [NSMutableDictionary dictionaryWithDictionary:self.defaultHeaders];
+
     
 
     id bodyDictionary = nil;
     
     
 
-    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init]; 
+    NSMutableDictionary * formParams = [[NSMutableDictionary alloc]init];
 
     
     
@@ -640,4 +732,4 @@ static NSString * basePath = @"http://petstore.swagger.io/v2";
 
 
 
-@end
\ No newline at end of file
+@end
diff --git a/samples/client/petstore/objc/pom.xml b/samples/client/petstore/objc/pom.xml
index 0a6e65e1d4f..42e116ac170 100644
--- a/samples/client/petstore/objc/pom.xml
+++ b/samples/client/petstore/objc/pom.xml
@@ -1,7 +1,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>de.felixschulze.my-project</groupId>
-  <artifactId>PetstoreClient</artifactId>
+  <groupId>com.wordnik</groupId>
+  <artifactId>ObjcPetstoreClientTests</artifactId>
   <packaging>pom</packaging>
   <version>1.0-SNAPSHOT</version>
   <name>Objective-C Swagger Petstore Client</name>
@@ -21,28 +21,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
-        <version>${jetty-version}</version>
-        <configuration>
-          <war>${project.build.directory}/swagger-java-jersey-sample-app-${webapp-version}.war</war>
-          <stopKey>alpha</stopKey>
-          <stopPort>9099</stopPort>
-          <httpConnector>
-            <port>8002</port>
-          </httpConnector>
-        </configuration>
-        <executions>
-          <execution>
-            <id>start-jetty</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>deploy-war</goal>
-            </goals>
-          </execution>
-         </executions>
-        </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -76,7 +54,7 @@
                 <argument>PetstoreClient</argument>
                 <argument>test</argument>
                 <argument>-destination</argument>
-                <argument>platform=iOS Simulator,name=iPhone 6,OS=8.2</argument>
+                <argument>platform=iOS Simulator,name=iPhone 6,OS=8.3</argument>
               </arguments>
             </configuration>
           </execution>
@@ -84,25 +62,4 @@
       </plugin>
     </plugins>
   </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.wordnik</groupId>
-      <artifactId>swagger-java-jersey-sample-app</artifactId>
-      <version>${webapp-version}</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-  <repositories>
-    <repository>
-      <id>sonatype-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  <properties>
-    <webapp-version>1.5.4-M1-SNAPSHOT</webapp-version>
-    <jetty-version>9.2.9.v20150224</jetty-version>
-  </properties>
 </project>
diff --git a/samples/client/petstore/objc/tests/PetApiTest.h b/samples/client/petstore/objc/tests/PetApiTest.h
deleted file mode 100644
index 8420d8b6759..00000000000
--- a/samples/client/petstore/objc/tests/PetApiTest.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <SenTestingKit/SenTestingKit.h>
-#import "RVBPetApi.h"
-
-@interface PetApiTest : SenTestCase {
-@private
-    RVBPetApi * api;
-}
-
-@end
diff --git a/samples/client/petstore/objc/tests/PetApiTest.m b/samples/client/petstore/objc/tests/PetApiTest.m
deleted file mode 100644
index 681ea44ca24..00000000000
--- a/samples/client/petstore/objc/tests/PetApiTest.m
+++ /dev/null
@@ -1,324 +0,0 @@
-#import "PetApiTest.h"
-#import "NIKFile.h"
-
-@implementation PetApiTest
-
-- (void)setUp {
-    [super setUp];
-    api = [[RVBPetApi alloc ]init];
-}
-
-- (void)tearDown {
-    [super tearDown];
-}
-
-- (void)testGetPetById {
-    bool done = false;
-    static RVBPet* pet = nil;
-    static NSError * gError = nil;
-
-    [api getPetByIdWithCompletionBlock:@"1" completionHandler:^(RVBPet *output, NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        if(output == nil){
-            NSLog(@"failed to fetch pet");
-        }
-        else {
-            pet = [[RVBPet alloc] initWithValues:[output asDictionary]];
-        }
-    }];
-
-    NSDate * loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        if(pet){
-            STAssertNotNil([pet _id], @"token was nil");
-            done = true;
-        }
-    }
-    STAssertNotNil(pet, @"failed to fetch valid result in 10 seconds");
-}
-
-- (void) testAddPet {
-    bool done = false;
-    static NSError * gError = nil;
-
-    RVBPet * petToAdd = [[RVBPet alloc] init];
-    [petToAdd set_id:@"1000"];
-    NSMutableArray* tags = [[NSMutableArray alloc] init];
-    for(int i = 0; i < 5; i++){
-        RVBTag * tag = [[RVBTag alloc] init];
-        [tag set_id:[NSNumber numberWithInt:i]];
-        [tag setName:[NSString stringWithFormat:@"tag-%d", i]];
-        [tags addObject:tag];
-    }
-    [petToAdd setTags:tags];
-    [petToAdd setStatus:@"lost"];
-
-    RVBCategory * category = [[RVBCategory alloc] init];
-    [category setName:@"sold"];
-    [petToAdd setCategory:category];
-    [petToAdd setName:@"dragon"];
-    
-    NSMutableArray* photos = [[NSMutableArray alloc] init];
-    for(int i = 0; i < 10; i++){
-        NSString * url = [NSString stringWithFormat:@"http://foo.com/photo/%d", i];
-        [photos addObject:url];
-    }
-    [petToAdd setPhotoUrls:photos];
-
-    static bool hasResponse = false;
-    [api addPetWithCompletionBlock:petToAdd completionHandler:^(NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        hasResponse = true;
-    }];
-    NSDate * loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        if(hasResponse){
-            done = true;
-        }
-    }
-
-    static RVBPet* pet = nil;
-
-    [api getPetByIdWithCompletionBlock:[NSString stringWithFormat:@"%@",[petToAdd _id]] completionHandler:^(RVBPet *output, NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        if(output == nil){
-            NSLog(@"failed to fetch pet");
-        }
-        else {
-            pet = [[RVBPet alloc] initWithValues:[output asDictionary]];
-        }
-    }];
-
-    loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    done = false;
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        if(pet){
-            STAssertNotNil([pet _id], @"pet was nil");
-            done = true;
-        }
-    }
-    STAssertNotNil(pet, @"failed to fetch valid result in 10 seconds");
-
-}
-
-- (void) testUpdatePet {
-    bool done = false;
-    static NSError * gError = nil;
-
-    RVBPet * petToAdd = [[RVBPet alloc] init];
-    [petToAdd set_id:[NSNumber numberWithInt:1000]];
-    NSMutableArray* tags = [[NSMutableArray alloc] init];
-    for(int i = 0; i < 5; i++){
-        RVBTag * tag = [[RVBTag alloc] init];
-        [tag set_id:[NSNumber numberWithInt:i]];
-        [tag setName:[NSString stringWithFormat:@"tag-%d", i]];
-        [tags addObject:tag];
-    }
-    [petToAdd setTags:tags];
-    [petToAdd setStatus:@"lost"];
-    
-    RVBCategory * category = [[RVBCategory alloc] init];
-    [category setName:@"sold"];
-    [petToAdd setCategory:category];
-    [petToAdd setName:@"dragon"];
-    
-    NSMutableArray* photos = [[NSMutableArray alloc] init];
-    for(int i = 0; i < 10; i++){
-        NSString * url = [NSString stringWithFormat:@"http://foo.com/photo/%d", i];
-        [photos addObject:url];
-    }
-    [petToAdd setPhotoUrls:photos];
-    
-    static bool hasResponse = false;
-    [api addPetWithCompletionBlock:petToAdd completionHandler:^(NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        hasResponse = true;
-    }];
-    NSDate * loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    done = false;
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            done = true;
-            STFail(@"got error %@", gError);
-        }
-        if(hasResponse){
-            done = true;
-            NSLog(@"pet was added");
-        }
-    }
-    
-    static RVBPet* pet = nil;
-    done = false;
-    
-    [api getPetByIdWithCompletionBlock:[NSString stringWithFormat:@"%@",[petToAdd _id]] completionHandler:^(RVBPet *output, NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        if(output == nil){
-            NSLog(@"failed to fetch pet");
-        }
-        else {
-            pet = [[RVBPet alloc] initWithValues:[output asDictionary]];
-            NSLog(@"got the pet");
-        }
-    }];
-    
-    loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        if(pet){
-            STAssertNotNil([pet _id], @"pet was nil");
-            done = true;
-        }
-    }
-    STAssertNotNil(pet, @"failed to fetch valid result in 10 seconds");
-    
-    [pet setName:@"programmer"];
-    [pet setStatus:@"confused"];
-    
-    hasResponse = false;
-    [api updatePetWithCompletionBlock:pet
-                    completionHandler:^(NSError *error) {
-                        if(error) {
-                            gError = error;
-                        }
-                        hasResponse = true;
-                    }];
-
-    loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    done = false;
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        else if(hasResponse) {
-            done = true;
-        }
-    }
-    
-    pet = nil;
-    done = false;
-    
-    [api getPetByIdWithCompletionBlock:[NSString stringWithFormat:@"%d",1000] completionHandler:^(RVBPet *output, NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        if(output == nil){
-            NSLog(@"failed to fetch pet");
-        }
-        else {
-            pet = [[RVBPet alloc] initWithValues:[output asDictionary]];
-        }
-    }];
-    
-    loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        if(pet){
-            STAssertNotNil([pet _id], @"pet was nil");
-            STAssertEqualObjects([pet name], @"programmer", @"pet name was not updated");
-            STAssertEqualObjects([pet status], @"confused", @"pet status was not updated");
-            done = true;
-        }
-    }
-    STAssertNotNil(pet, @"failed to fetch valid result in 10 seconds");
-}
-
-- (void)testGetPetByStatus {
-    bool done = false;
-    static NSMutableArray* pets = nil;
-    static NSError * gError = nil;
-    [api findPetsByStatusWithCompletionBlock:@"available" completionHandler:^(NSArray *output, NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        if(output == nil){
-            NSLog(@"failed to fetch pets");
-        }
-        else {
-            pets = [[NSMutableArray alloc]init];
-            for(RVBPet* pet in output) {
-                [pets addObject:[[RVBPet alloc] initWithValues:[pet asDictionary]]];
-            }
-        }
-    }];
-    NSDate * loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        if(pets){
-            for(RVBPet * pet in pets) {
-                STAssertEqualObjects([pet status], @"available", @"got invalid status for pets");
-            }
-            done = true;
-        }
-    }
-}
-
-- (void)testGetPetByTags {
-    bool done = false;
-    static NSMutableArray* pets = nil;
-    static NSError * gError = nil;
-    [api findPetsByTagsWithCompletionBlock:@"tag1,tag2" completionHandler:^(NSArray *output, NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        if(output == nil){
-            NSLog(@"failed to fetch pets");
-        }
-        else {
-            pets = [[NSMutableArray alloc]init];
-            for(RVBPet* pet in output) {
-                [pets addObject:[[RVBPet alloc] initWithValues:[pet asDictionary]]];
-            }
-        }
-    }];
-    NSDate * loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        if(pets){
-            for(RVBPet * pet in pets) {
-                bool hasTag = false;
-                for(RVBTag * tag in [pet tags]){
-                    if([[tag name] isEqualToString:@"tag1"] || [[tag name] isEqualToString:@"tag2"])
-                        hasTag = true;
-                }
-                if(!hasTag) STFail(@"failed to find tag in pet");
-            }
-            done = true;
-        }
-    }
-}
-@end
diff --git a/samples/client/petstore/objc/tests/PetstoreClientTests-Info.plist b/samples/client/petstore/objc/tests/PetstoreClientTests-Info.plist
deleted file mode 100644
index dd6d9a681de..00000000000
--- a/samples/client/petstore/objc/tests/PetstoreClientTests-Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.wordnik.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>
diff --git a/samples/client/petstore/objc/tests/PetstoreClientTests-Prefix.pch b/samples/client/petstore/objc/tests/PetstoreClientTests-Prefix.pch
deleted file mode 100644
index c07489a293a..00000000000
--- a/samples/client/petstore/objc/tests/PetstoreClientTests-Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'PetstoreClientTests' target in the 'PetstoreClientTests' project
-//
-
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
diff --git a/samples/client/petstore/objc/tests/UserApiTest.h b/samples/client/petstore/objc/tests/UserApiTest.h
deleted file mode 100644
index 703381f2023..00000000000
--- a/samples/client/petstore/objc/tests/UserApiTest.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <SenTestingKit/SenTestingKit.h>
-#import "RVBUserApi.h"
-
-@interface UserApiTest : SenTestCase {
-@private
-    RVBUserApi * api;
-}
-
-@end
diff --git a/samples/client/petstore/objc/tests/UserApiTest.m b/samples/client/petstore/objc/tests/UserApiTest.m
deleted file mode 100644
index 2c6859c3f43..00000000000
--- a/samples/client/petstore/objc/tests/UserApiTest.m
+++ /dev/null
@@ -1,47 +0,0 @@
-#import "UserApiTest.h"
-
-@implementation UserApiTest
-
-- (void)setUp {
-    [super setUp];
-    api = [[RVBUserApi alloc ]init];
-}
-
-- (void)tearDown {
-    [super tearDown];
-}
-
-- (void)testLoginUser {
-    bool done = false;
-    static NSString* authString = nil;
-    static NSError * gError = nil;
-    
-    [api loginUserWithCompletionBlock:@"foo"
-                             password:@"bar"
-                    completionHandler:^(NSString *output, NSError *error) {
-        if(error) {
-            gError = error;
-        }
-        if(output == nil){
-            NSLog(@"failed to login");
-        }
-        else {
-            authString = [NSString stringWithString:output];
-        }
-    }];
-
-    NSDate * loopUntil = [NSDate dateWithTimeIntervalSinceNow:10];
-    while(!done && [loopUntil timeIntervalSinceNow] > 0){
-        if(gError){
-            STFail(@"got error %@", gError);
-            done = true;
-        }
-        if(authString){
-            done = true;
-        }
-    }
-    STAssertTrue([authString length] > 0, @"string was zero chars");
-    NSLog(@"got login %@", authString);
-}
-
-@end
diff --git a/samples/client/petstore/php/PetApi.php b/samples/client/petstore/php/PetApi.php
deleted file mode 100644
index 49f623b4da4..00000000000
--- a/samples/client/petstore/php/PetApi.php
+++ /dev/null
@@ -1,434 +0,0 @@
-<?php
-/**
- *  Copyright 2015 Reverb Technologies, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- */
-class PetApi {
-
-	function __construct($apiClient) {
-	  $this->apiClient = $apiClient;
-	}
-
-  
-	/**
-	 * updatePet
-   *
-	 * Update an existing pet
-   * body, Pet: Pet object that needs to be added to the store (required)
-   * 
-	 * @return 
-	 */
-
-   public function updatePet($body) {
-
-  		// parse inputs
-  		$resourcePath = "/pet";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "PUT";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = 'application/json,application/xml';
-
-      
-      
-      
-      
-      // body params
-      $body = null;
-      if (isset($body)) {
-        $body = $body;
-      }
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * addPet
-   *
-	 * Add a new pet to the store
-   * body, Pet: Pet object that needs to be added to the store (required)
-   * 
-	 * @return 
-	 */
-
-   public function addPet($body) {
-
-  		// parse inputs
-  		$resourcePath = "/pet";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "POST";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = 'application/json,application/xml';
-
-      
-      
-      
-      
-      // body params
-      $body = null;
-      if (isset($body)) {
-        $body = $body;
-      }
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * findPetsByStatus
-   *
-	 * Finds Pets by status
-   * status, array[string]: Status values that need to be considered for filter (required)
-   * 
-	 * @return array[Pet]
-	 */
-
-   public function findPetsByStatus($status) {
-
-  		// parse inputs
-  		$resourcePath = "/pet/findByStatus";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      // query params
-      if($status !== null) {
-  		  $queryParams['status'] = $this->apiClient->toQueryValue($status);
-  		}
-      
-      
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      if(! $response) {
-        return null;
-      }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'array[Pet]');
-  		return $responseObject;
-  }
-  
-	/**
-	 * findPetsByTags
-   *
-	 * Finds Pets by tags
-   * tags, array[string]: Tags to filter by (required)
-   * 
-	 * @return array[Pet]
-	 */
-
-   public function findPetsByTags($tags) {
-
-  		// parse inputs
-  		$resourcePath = "/pet/findByTags";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      // query params
-      if($tags !== null) {
-  		  $queryParams['tags'] = $this->apiClient->toQueryValue($tags);
-  		}
-      
-      
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      if(! $response) {
-        return null;
-      }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'array[Pet]');
-  		return $responseObject;
-  }
-  
-	/**
-	 * getPetById
-   *
-	 * Find pet by ID
-   * pet_id, int: ID of pet that needs to be fetched (required)
-   * 
-	 * @return Pet
-	 */
-
-   public function getPetById($pet_id) {
-
-  		// parse inputs
-  		$resourcePath = "/pet/{petId}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-  			$resourcePath = str_replace("{" . "petId" . "}",
-  			                            $this->apiClient->toPathValue($pet_id), $resourcePath);
-  		}
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      if(! $response) {
-        return null;
-      }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'Pet');
-  		return $responseObject;
-  }
-  
-	/**
-	 * updatePetWithForm
-   *
-	 * Updates a pet in the store with form data
-   * pet_id, string: ID of pet that needs to be updated (required)
-   * * name, string: Updated name of the pet (required)
-   * * status, string: Updated status of the pet (required)
-   * 
-	 * @return 
-	 */
-
-   public function updatePetWithForm($pet_id, $name, $status) {
-
-  		// parse inputs
-  		$resourcePath = "/pet/{petId}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "POST";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = 'application/x-www-form-urlencoded';
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-  			$resourcePath = str_replace("{" . "petId" . "}",
-  			                            $this->apiClient->toPathValue($pet_id), $resourcePath);
-  		}
-      // form params
-      if ($name !== null) {
-        $formParams['name'] = $this->apiClient->toFormValue($name);
-      }// form params
-      if ($status !== null) {
-        $formParams['status'] = $this->apiClient->toFormValue($status);
-      }
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * deletePet
-   *
-	 * Deletes a pet
-   * api_key, string:  (required)
-   * * pet_id, int: Pet id to delete (required)
-   * 
-	 * @return 
-	 */
-
-   public function deletePet($api_key, $pet_id) {
-
-  		// parse inputs
-  		$resourcePath = "/pet/{petId}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "DELETE";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      // header params
-      if($api_key !== null) {
-  		 	$headerParams['api_key'] = $this->apiClient->toHeaderValue($api_key);
-  		}
-      // path params
-      if($pet_id !== null) {
-  			$resourcePath = str_replace("{" . "petId" . "}",
-  			                            $this->apiClient->toPathValue($pet_id), $resourcePath);
-  		}
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * uploadFile
-   *
-	 * uploads an image
-   * pet_id, int: ID of pet to update (required)
-   * * additional_metadata, string: Additional data to pass to server (required)
-   * * file, file: file to upload (required)
-   * 
-	 * @return 
-	 */
-
-   public function uploadFile($pet_id, $additional_metadata, $file) {
-
-  		// parse inputs
-  		$resourcePath = "/pet/{petId}/uploadImage";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "POST";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = 'multipart/form-data';
-
-      
-      
-      // path params
-      if($pet_id !== null) {
-  			$resourcePath = str_replace("{" . "petId" . "}",
-  			                            $this->apiClient->toPathValue($pet_id), $resourcePath);
-  		}
-      // form params
-      if ($additional_metadata !== null) {
-        $formParams['additionalMetadata'] = $this->apiClient->toFormValue($additional_metadata);
-      }// form params
-      if ($file !== null) {
-        $formParams['file'] = '@' . $this->apiClient->toFormValue($file);
-      }
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/StoreApi.php b/samples/client/petstore/php/StoreApi.php
deleted file mode 100644
index 12b46286502..00000000000
--- a/samples/client/petstore/php/StoreApi.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/**
- *  Copyright 2015 Reverb Technologies, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- */
-class StoreApi {
-
-	function __construct($apiClient) {
-	  $this->apiClient = $apiClient;
-	}
-
-  
-	/**
-	 * getInventory
-   *
-	 * Returns pet inventories by status
-   
-	 * @return map[string,int]
-	 */
-
-   public function getInventory() {
-
-  		// parse inputs
-  		$resourcePath = "/store/inventory";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      if(! $response) {
-        return null;
-      }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'map[string,int]');
-  		return $responseObject;
-  }
-  
-	/**
-	 * placeOrder
-   *
-	 * Place an order for a pet
-   * body, Order: order placed for purchasing the pet (required)
-   * 
-	 * @return Order
-	 */
-
-   public function placeOrder($body) {
-
-  		// parse inputs
-  		$resourcePath = "/store/order";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "POST";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      
-      
-      // body params
-      $body = null;
-      if (isset($body)) {
-        $body = $body;
-      }
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      if(! $response) {
-        return null;
-      }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'Order');
-  		return $responseObject;
-  }
-  
-	/**
-	 * getOrderById
-   *
-	 * Find purchase order by ID
-   * order_id, string: ID of pet that needs to be fetched (required)
-   * 
-	 * @return Order
-	 */
-
-   public function getOrderById($order_id) {
-
-  		// parse inputs
-  		$resourcePath = "/store/order/{orderId}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      // path params
-      if($order_id !== null) {
-  			$resourcePath = str_replace("{" . "orderId" . "}",
-  			                            $this->apiClient->toPathValue($order_id), $resourcePath);
-  		}
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      if(! $response) {
-        return null;
-      }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'Order');
-  		return $responseObject;
-  }
-  
-	/**
-	 * deleteOrder
-   *
-	 * Delete purchase order by ID
-   * order_id, string: ID of the order that needs to be deleted (required)
-   * 
-	 * @return 
-	 */
-
-   public function deleteOrder($order_id) {
-
-  		// parse inputs
-  		$resourcePath = "/store/order/{orderId}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "DELETE";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      // path params
-      if($order_id !== null) {
-  			$resourcePath = str_replace("{" . "orderId" . "}",
-  			                            $this->apiClient->toPathValue($order_id), $resourcePath);
-  		}
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/SwaggerClient-php/README.md b/samples/client/petstore/php/SwaggerClient-php/README.md
new file mode 100644
index 00000000000..6dfd19a292a
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/README.md
@@ -0,0 +1,52 @@
+## Requirements
+
+PHP 5.3.3 and later.
+
+## Composer
+
+You can install the bindings via [Composer](http://getcomposer.org/). Add this to your `composer.json`:
+
+    {
+        "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/wing328/SwaggerPetstore-php.git"
+        }
+        ],
+        "require": {
+            "SwaggerPetstore/SwaggerPetstore-php": "*@dev"
+        }
+    }
+
+Then install via:
+
+    composer install
+
+To use the bindings, use Composer's [autoload](https://getcomposer.org/doc/00-intro.md#autoloading):
+
+    require_once('vendor/autoload.php');
+
+## Manual Installation
+
+If you do not wish to use Composer, you can download the latest release. Then, to use the bindings, include the `SwaggerPetstore.php` file.
+
+    require_once('/path/to/SwaggerPetstore-php/SwaggerPetstore.php');
+
+## Getting Started
+
+php test.php
+
+## Documentation
+
+TODO
+
+## Tests
+
+In order to run tests first install [PHPUnit](http://packagist.org/packages/phpunit/phpunit) via [Composer](http://getcomposer.org/):
+
+    composer update
+
+To run the test suite:
+
+    ./vendor/bin/phpunit tests
+
diff --git a/samples/client/petstore/php/SwaggerClient-php/SwaggerClient.php b/samples/client/petstore/php/SwaggerClient-php/SwaggerClient.php
new file mode 100644
index 00000000000..058aa169504
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/SwaggerClient.php
@@ -0,0 +1,16 @@
+<?php
+// source code generated by http://restunited.com
+// for any feedback/issue, please send to feedback{at}restunited.com
+
+// load models defined for endpoints
+foreach (glob(dirname(__FILE__)."/lib/models/*.php") as $filename)
+{
+      require_once $filename;
+}
+
+// load classes for accessing the endpoints
+foreach (glob(dirname(__FILE__)."/lib/*.php") as $filename)
+{
+      require_once $filename;
+}
+?>
diff --git a/samples/client/petstore/php/SwaggerClient-php/composer.json b/samples/client/petstore/php/SwaggerClient-php/composer.json
new file mode 100644
index 00000000000..13fc1b62690
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/composer.json
@@ -0,0 +1,32 @@
+{
+  "name": "SwaggerClient/SwaggerClient-php",
+  "description": "",
+  "keywords": [
+    "swagger",
+    "php",
+    "sdk",
+    "api"
+  ],
+  "homepage": "http://swagger.io",
+  "license": "Apache v2",
+  "authors": [
+    {
+      "name": "Swagger and contributors",
+      "homepage": "https://github.com/swagger-api/swagger-codegen"
+    }
+  ],
+  "require": {
+    "php": ">=5.3.3",
+    "ext-curl": "*",
+    "ext-json": "*",
+    "ext-mbstring": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.0",
+    "satooshi/php-coveralls": "~0.6.1",
+    "squizlabs/php_codesniffer": "~2.0"
+  },
+  "autoload": {
+    "psr-4": { "SwaggerClient\\" : "lib/" }
+  }
+}
diff --git a/modules/swagger-codegen/src/main/resources/php/Swagger.mustache b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php
similarity index 84%
rename from modules/swagger-codegen/src/main/resources/php/Swagger.mustache
rename to samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php
index 3d6b77d819e..f69675c1e9b 100644
--- a/modules/swagger-codegen/src/main/resources/php/Swagger.mustache
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/APIClient.php
@@ -15,29 +15,26 @@
  *  limitations under the License.
  */
 
-/* Autoload the model definition files */
-/**
- *
- * @param string $className the class to attempt to load
- */
-function swagger_autoloader($className) {
-  $currentDir = dirname(__FILE__);
-  if (file_exists($currentDir . '/' . $className . '.php')) {
-    include $currentDir . '/' . $className . '.php';
-  } elseif (file_exists($currentDir . '/models/' . $className . '.php')) {
-    include $currentDir . '/models/' . $className . '.php';
-  }
-}
-spl_autoload_register('swagger_autoloader');
-
+namespace SwaggerClient;
 
 class APIClient {
 
+  public static $PATCH = "PATCH";
   public static $POST = "POST";
   public static $GET = "GET";
   public static $PUT = "PUT";
   public static $DELETE = "DELETE";
 
+  /*
+   * @var string timeout (second) of the HTTP request, by default set to 0, no timeout
+   */
+  protected $curl_timeout = 0;
+
+  /*
+   * @var string user agent of the HTTP request, set to "PHP-Swagger" by default
+   */
+  protected $user_agent = "PHP-Swagger";
+
   /**
    * @param string $host the address of the API server
    * @param string $headerName a header to pass on requests 
@@ -67,7 +64,7 @@ class APIClient {
     if (!is_numeric($seconds)) {
       throw new Exception('Timeout variable must be numeric.');
     }
-    $this->curl_timout = $seconds;
+    $this->curl_timeout = $seconds;
   }
 
   /**
@@ -97,15 +94,16 @@ class APIClient {
       $headers[] = $this->headerName . ": " . $this->headerValue;
     }
 
-    if (strpos($headers['Content-Type'], "multipart/form-data") < 0 and (is_object($postData) or is_array($postData))) {
+    if ((isset($headerName['Content-Type']) and strpos($headerName['Content-Type'], "multipart/form-data") === FALSE) and (is_object($postData) or is_array($postData))) {
       $postData = json_encode($this->sanitizeForSerialization($postData));
     }
 
     $url = $this->host . $resourcePath;
 
     $curl = curl_init();
-    if ($this->curl_timout) {
-      curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timout);
+    // set timeout, if needed
+    if ($this->curl_timeout != 0) {
+      curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
     }
     // return the result on success, rather than just TRUE
     curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
@@ -133,11 +131,7 @@ class APIClient {
     curl_setopt($curl, CURLOPT_URL, $url);
 
     // Set user agent
-    if ($this->user_agent) {
-      curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
-    } else { // use PHP-Swagger as the default user agent
-      curl_setopt($curl, CURLOPT_USERAGENT, 'PHP-Swagger');
-    }
+    curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
 
     // Make the request
     $response = curl_exec($curl);
@@ -199,7 +193,7 @@ class APIClient {
    * @return string the serialized object
    */
   public static function toPathValue($value) {
-      return rawurlencode(toString($value));
+      return rawurlencode(self::toString($value));
   }
 
   /**
@@ -214,7 +208,7 @@ class APIClient {
         if (is_array($object)) {
             return implode(',', $object);
         } else {
-            return toString($object);
+            return self::toString($object);
         }
   }
 
@@ -226,7 +220,7 @@ class APIClient {
    * @return string the header string
    */
   public static function toHeaderValue($value) {
-      return toString($value);
+      return self::toString($value);
   }
 
   /**
@@ -237,7 +231,7 @@ class APIClient {
    * @return string the form string
    */
   public static function toFormValue($value) {
-      return toString($value);
+      return self::toString($value);
   }
 
   /**
@@ -288,14 +282,15 @@ class APIClient {
       $deserialized = $values;
     } elseif ($class == 'DateTime') {
       $deserialized = new \DateTime($data);
-    } elseif (in_array($class, array('string', 'int', 'float', 'bool'))) {
+    } elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool'))) {
       settype($data, $class);
       $deserialized = $data;
     } else {
+      $class = "SwaggerClient\\models\\".$class;
       $instance = new $class();
       foreach ($instance::$swaggerTypes as $property => $type) {
-        if (isset($data->$property)) {
-          $original_property_name = $instance::$attributeMap[$property];
+        $original_property_name = $instance::$attributeMap[$property];
+        if (isset($original_property_name)) {
           $instance->$property = self::deserialize($data->$original_property_name, $type);
         }
       }
@@ -307,20 +302,3 @@ class APIClient {
 
 }
 
-class APIClientException extends Exception {
-  protected $response, $response_info;
-
-  public function __construct($message="", $code=0, $response_info=null, $response=null) {
-    parent::__construct($message, $code);
-    $this->response_info = $response_info;
-    $this->response = $response;
-  }
-
-  public function getResponse() {
-    return $this->response;
-  }
-
-  public function getResponseInfo() {
-    return $this->response_info;
-  }
-}
diff --git a/samples/client/petstore/ruby/RubyPetstoreCodegen.scala b/samples/client/petstore/php/SwaggerClient-php/lib/APIClientException.php
similarity index 51%
rename from samples/client/petstore/ruby/RubyPetstoreCodegen.scala
rename to samples/client/petstore/php/SwaggerClient-php/lib/APIClientException.php
index 2c7212b379e..8d83da0186e 100644
--- a/samples/client/petstore/ruby/RubyPetstoreCodegen.scala
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/APIClientException.php
@@ -1,5 +1,6 @@
+<?php
 /**
- *  Copyright 2014 Wordnik, Inc.
+ *  Copyright 2015 Reverb Technologies, Inc.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -14,14 +15,24 @@
  *  limitations under the License.
  */
 
-import com.wordnik.swagger.codegen.BasicRubyGenerator
+namespace SwaggerClient;
 
-object RubyPetstoreCodegen extends BasicRubyGenerator {
-  def main(args: Array[String]) = generateClient(args)
-  
-  // to avoid recompiling ...
-  override def templateDir = "src/main/resources/ruby"
+use \Exception;
 
-  // where to write generated code
-  override def destinationDir = "samples/client/petstore/ruby"
-}
\ No newline at end of file
+class APIClientException extends Exception {
+  protected $response, $response_info;
+
+  public function __construct($message="", $code=0, $response_info=null, $response=null) {
+    parent::__construct($message, $code);
+    $this->response_info = $response_info;
+    $this->response = $response;
+  }
+
+  public function getResponse() {
+    return $this->response;
+  }
+
+  public function getResponseInfo() {
+    return $this->response_info;
+  }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php
new file mode 100644
index 00000000000..80d9c040d1e
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/PetApi.php
@@ -0,0 +1,493 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ *
+ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ */
+
+namespace SwaggerClient;
+
+class PetApi {
+
+  function __construct($apiClient) {
+    $this->apiClient = $apiClient;
+  }
+
+  
+  /**
+   * updatePet
+   *
+   * Update an existing pet
+   *
+   * @param Pet $body Pet object that needs to be added to the store (required)
+   * @return void
+   */
+   public function updatePet($body) {
+
+      // parse inputs
+      $resourcePath = "/pet";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "PUT";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array('application/json','application/xml',);
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      
+      
+      // body params
+      $_tempBody = null;
+      if (isset($body)) {
+        $_tempBody = $body;
+      }
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * addPet
+   *
+   * Add a new pet to the store
+   *
+   * @param Pet $body Pet object that needs to be added to the store (required)
+   * @return void
+   */
+   public function addPet($body) {
+
+      // parse inputs
+      $resourcePath = "/pet";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "POST";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array('application/json','application/xml',);
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      
+      
+      // body params
+      $_tempBody = null;
+      if (isset($body)) {
+        $_tempBody = $body;
+      }
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * findPetsByStatus
+   *
+   * Finds Pets by status
+   *
+   * @param array[string] $status Status values that need to be considered for filter (required)
+   * @return array[Pet]
+   */
+   public function findPetsByStatus($status) {
+
+      // parse inputs
+      $resourcePath = "/pet/findByStatus";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "GET";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      // query params
+      if($status !== null) {
+        $queryParams['status'] = $this->apiClient->toQueryValue($status);
+      }
+      
+      
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      if(! $response) {
+        return null;
+      }
+
+  		$responseObject = $this->apiClient->deserialize($response,
+  		                                                'array[Pet]');
+  		return $responseObject;
+  }
+  
+  /**
+   * findPetsByTags
+   *
+   * Finds Pets by tags
+   *
+   * @param array[string] $tags Tags to filter by (required)
+   * @return array[Pet]
+   */
+   public function findPetsByTags($tags) {
+
+      // parse inputs
+      $resourcePath = "/pet/findByTags";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "GET";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      // query params
+      if($tags !== null) {
+        $queryParams['tags'] = $this->apiClient->toQueryValue($tags);
+      }
+      
+      
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      if(! $response) {
+        return null;
+      }
+
+  		$responseObject = $this->apiClient->deserialize($response,
+  		                                                'array[Pet]');
+  		return $responseObject;
+  }
+  
+  /**
+   * getPetById
+   *
+   * Find pet by ID
+   *
+   * @param int $pet_id ID of pet that needs to be fetched (required)
+   * @return Pet
+   */
+   public function getPetById($pet_id) {
+
+      // parse inputs
+      $resourcePath = "/pet/{petId}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "GET";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      // path params
+      if($pet_id !== null) {
+        $resourcePath = str_replace("{" . "petId" . "}",
+                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
+      }
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      if(! $response) {
+        return null;
+      }
+
+  		$responseObject = $this->apiClient->deserialize($response,
+  		                                                'Pet');
+  		return $responseObject;
+  }
+  
+  /**
+   * updatePetWithForm
+   *
+   * Updates a pet in the store with form data
+   *
+   * @param string $pet_id ID of pet that needs to be updated (required)
+   * @param string $name Updated name of the pet (required)
+   * @param string $status Updated status of the pet (required)
+   * @return void
+   */
+   public function updatePetWithForm($pet_id, $name, $status) {
+
+      // parse inputs
+      $resourcePath = "/pet/{petId}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "POST";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array('application/x-www-form-urlencoded',);
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      // path params
+      if($pet_id !== null) {
+        $resourcePath = str_replace("{" . "petId" . "}",
+                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
+      }
+      // form params
+      if ($name !== null) {
+        $formParams['name'] = $this->apiClient->toFormValue($name);
+      }// form params
+      if ($status !== null) {
+        $formParams['status'] = $this->apiClient->toFormValue($status);
+      }
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * deletePet
+   *
+   * Deletes a pet
+   *
+   * @param string $api_key  (required)
+   * @param int $pet_id Pet id to delete (required)
+   * @return void
+   */
+   public function deletePet($api_key, $pet_id) {
+
+      // parse inputs
+      $resourcePath = "/pet/{petId}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "DELETE";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      // header params
+      if($api_key !== null) {
+        $headerParams['api_key'] = $this->apiClient->toHeaderValue($api_key);
+      }
+      // path params
+      if($pet_id !== null) {
+        $resourcePath = str_replace("{" . "petId" . "}",
+                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
+      }
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * uploadFile
+   *
+   * uploads an image
+   *
+   * @param int $pet_id ID of pet to update (required)
+   * @param string $additional_metadata Additional data to pass to server (required)
+   * @param file $file file to upload (required)
+   * @return void
+   */
+   public function uploadFile($pet_id, $additional_metadata, $file) {
+
+      // parse inputs
+      $resourcePath = "/pet/{petId}/uploadImage";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "POST";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array('multipart/form-data',);
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      // path params
+      if($pet_id !== null) {
+        $resourcePath = str_replace("{" . "petId" . "}",
+                                    $this->apiClient->toPathValue($pet_id), $resourcePath);
+      }
+      // form params
+      if ($additional_metadata !== null) {
+        $formParams['additionalMetadata'] = $this->apiClient->toFormValue($additional_metadata);
+      }// form params
+      if ($file !== null) {
+        $formParams['file'] = '@' . $this->apiClient->toFormValue($file);
+      }
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
new file mode 100644
index 00000000000..4e40ed983b9
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/StoreApi.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ *
+ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ */
+
+namespace SwaggerClient;
+
+class StoreApi {
+
+  function __construct($apiClient) {
+    $this->apiClient = $apiClient;
+  }
+
+  
+  /**
+   * getInventory
+   *
+   * Returns pet inventories by status
+   *
+   * @return map[string,int]
+   */
+   public function getInventory() {
+
+      // parse inputs
+      $resourcePath = "/store/inventory";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "GET";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      if(! $response) {
+        return null;
+      }
+
+  		$responseObject = $this->apiClient->deserialize($response,
+  		                                                'map[string,int]');
+  		return $responseObject;
+  }
+  
+  /**
+   * placeOrder
+   *
+   * Place an order for a pet
+   *
+   * @param Order $body order placed for purchasing the pet (required)
+   * @return Order
+   */
+   public function placeOrder($body) {
+
+      // parse inputs
+      $resourcePath = "/store/order";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "POST";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      
+      
+      // body params
+      $_tempBody = null;
+      if (isset($body)) {
+        $_tempBody = $body;
+      }
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      if(! $response) {
+        return null;
+      }
+
+  		$responseObject = $this->apiClient->deserialize($response,
+  		                                                'Order');
+  		return $responseObject;
+  }
+  
+  /**
+   * getOrderById
+   *
+   * Find purchase order by ID
+   *
+   * @param string $order_id ID of pet that needs to be fetched (required)
+   * @return Order
+   */
+   public function getOrderById($order_id) {
+
+      // parse inputs
+      $resourcePath = "/store/order/{orderId}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "GET";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      // path params
+      if($order_id !== null) {
+        $resourcePath = str_replace("{" . "orderId" . "}",
+                                    $this->apiClient->toPathValue($order_id), $resourcePath);
+      }
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      if(! $response) {
+        return null;
+      }
+
+  		$responseObject = $this->apiClient->deserialize($response,
+  		                                                'Order');
+  		return $responseObject;
+  }
+  
+  /**
+   * deleteOrder
+   *
+   * Delete purchase order by ID
+   *
+   * @param string $order_id ID of the order that needs to be deleted (required)
+   * @return void
+   */
+   public function deleteOrder($order_id) {
+
+      // parse inputs
+      $resourcePath = "/store/order/{orderId}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "DELETE";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      // path params
+      if($order_id !== null) {
+        $resourcePath = str_replace("{" . "orderId" . "}",
+                                    $this->apiClient->toPathValue($order_id), $resourcePath);
+      }
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php b/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php
new file mode 100644
index 00000000000..f3e9e7f4cc6
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/UserApi.php
@@ -0,0 +1,472 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ *
+ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ */
+
+namespace SwaggerClient;
+
+class UserApi {
+
+  function __construct($apiClient) {
+    $this->apiClient = $apiClient;
+  }
+
+  
+  /**
+   * createUser
+   *
+   * Create user
+   *
+   * @param User $body Created user object (required)
+   * @return void
+   */
+   public function createUser($body) {
+
+      // parse inputs
+      $resourcePath = "/user";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "POST";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      
+      
+      // body params
+      $_tempBody = null;
+      if (isset($body)) {
+        $_tempBody = $body;
+      }
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * createUsersWithArrayInput
+   *
+   * Creates list of users with given input array
+   *
+   * @param array[User] $body List of user object (required)
+   * @return void
+   */
+   public function createUsersWithArrayInput($body) {
+
+      // parse inputs
+      $resourcePath = "/user/createWithArray";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "POST";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      
+      
+      // body params
+      $_tempBody = null;
+      if (isset($body)) {
+        $_tempBody = $body;
+      }
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * createUsersWithListInput
+   *
+   * Creates list of users with given input array
+   *
+   * @param array[User] $body List of user object (required)
+   * @return void
+   */
+   public function createUsersWithListInput($body) {
+
+      // parse inputs
+      $resourcePath = "/user/createWithList";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "POST";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      
+      
+      // body params
+      $_tempBody = null;
+      if (isset($body)) {
+        $_tempBody = $body;
+      }
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * loginUser
+   *
+   * Logs user into the system
+   *
+   * @param string $username The user name for login (required)
+   * @param string $password The password for login in clear text (required)
+   * @return string
+   */
+   public function loginUser($username, $password) {
+
+      // parse inputs
+      $resourcePath = "/user/login";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "GET";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      // query params
+      if($username !== null) {
+        $queryParams['username'] = $this->apiClient->toQueryValue($username);
+      }// query params
+      if($password !== null) {
+        $queryParams['password'] = $this->apiClient->toQueryValue($password);
+      }
+      
+      
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      if(! $response) {
+        return null;
+      }
+
+  		$responseObject = $this->apiClient->deserialize($response,
+  		                                                'string');
+  		return $responseObject;
+  }
+  
+  /**
+   * logoutUser
+   *
+   * Logs out current logged in user session
+   *
+   * @return void
+   */
+   public function logoutUser() {
+
+      // parse inputs
+      $resourcePath = "/user/logout";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "GET";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * getUserByName
+   *
+   * Get user by user name
+   *
+   * @param string $username The name that needs to be fetched. Use user1 for testing.  (required)
+   * @return User
+   */
+   public function getUserByName($username) {
+
+      // parse inputs
+      $resourcePath = "/user/{username}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "GET";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      // path params
+      if($username !== null) {
+        $resourcePath = str_replace("{" . "username" . "}",
+                                    $this->apiClient->toPathValue($username), $resourcePath);
+      }
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      if(! $response) {
+        return null;
+      }
+
+  		$responseObject = $this->apiClient->deserialize($response,
+  		                                                'User');
+  		return $responseObject;
+  }
+  
+  /**
+   * updateUser
+   *
+   * Updated user
+   *
+   * @param string $username name that need to be deleted (required)
+   * @param User $body Updated user object (required)
+   * @return void
+   */
+   public function updateUser($username, $body) {
+
+      // parse inputs
+      $resourcePath = "/user/{username}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "PUT";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      // path params
+      if($username !== null) {
+        $resourcePath = str_replace("{" . "username" . "}",
+                                    $this->apiClient->toPathValue($username), $resourcePath);
+      }
+      
+      // body params
+      $_tempBody = null;
+      if (isset($body)) {
+        $_tempBody = $body;
+      }
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+  /**
+   * deleteUser
+   *
+   * Delete user
+   *
+   * @param string $username The name that needs to be deleted (required)
+   * @return void
+   */
+   public function deleteUser($username) {
+
+      // parse inputs
+      $resourcePath = "/user/{username}";
+      $resourcePath = str_replace("{format}", "json", $resourcePath);
+      $method = "DELETE";
+      $httpBody = '';
+      $queryParams = array();
+      $headerParams = array();
+      $formParams = array();
+      $_header_accept = 'application/json, application/xml';
+      if ($_header_accept !== '') {
+        $headerParams['Accept'] = $_header_accept;
+      }
+      $_header_content_type = array();
+      $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json';
+
+      
+      
+      // path params
+      if($username !== null) {
+        $resourcePath = str_replace("{" . "username" . "}",
+                                    $this->apiClient->toPathValue($username), $resourcePath);
+      }
+      
+      
+
+      // for model (json/xml)
+      if (isset($_tempBody)) {
+        $httpBody = $_tempBody; // $_tempBody is the method argument, if present
+      }
+      
+      // for HTTP post (form)
+      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") !== FALSE) {
+        $httpBody = http_build_query($formParams);
+      }
+
+      // make the API Call
+      $response = $this->apiClient->callAPI($resourcePath, $method,
+                                            $queryParams, $httpBody,
+                                            $headerParams);
+
+      
+  }
+  
+
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php
new file mode 100644
index 00000000000..9c2a6542301
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Category.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ *
+ */
+
+namespace SwaggerClient\models;
+
+use \ArrayAccess;
+
+class Category implements ArrayAccess {
+  static $swaggerTypes = array(
+      'id' => 'int',
+      'name' => 'string'
+  );
+
+  static $attributeMap = array(
+      'id' => 'id',
+      'name' => 'name'
+  );
+
+  
+  public $id; /* int */
+  public $name; /* string */
+
+  public function __construct(array $data = null) {
+    $this->id = $data["id"];
+    $this->name = $data["name"];
+  }
+
+  public function offsetExists($offset) {
+    return isset($this->$offset);
+  }
+
+  public function offsetGet($offset) {
+    return $this->$offset;
+  }
+
+  public function offsetSet($offset, $value) {
+    $this->$offset = $value;
+  }
+
+  public function offsetUnset($offset) {
+    unset($this->$offset);
+  }
+}
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php
new file mode 100644
index 00000000000..c6a909b29ef
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Order.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ *
+ */
+
+namespace SwaggerClient\models;
+
+use \ArrayAccess;
+
+class Order implements ArrayAccess {
+  static $swaggerTypes = array(
+      'id' => 'int',
+      'pet_id' => 'int',
+      'quantity' => 'int',
+      'ship_date' => 'DateTime',
+      'status' => 'string',
+      'complete' => 'boolean'
+  );
+
+  static $attributeMap = array(
+      'id' => 'id',
+      'pet_id' => 'petId',
+      'quantity' => 'quantity',
+      'ship_date' => 'shipDate',
+      'status' => 'status',
+      'complete' => 'complete'
+  );
+
+  
+  public $id; /* int */
+  public $pet_id; /* int */
+  public $quantity; /* int */
+  public $ship_date; /* DateTime */
+  /**
+  * Order Status
+  */
+  public $status; /* string */
+  public $complete; /* boolean */
+
+  public function __construct(array $data = null) {
+    $this->id = $data["id"];
+    $this->pet_id = $data["pet_id"];
+    $this->quantity = $data["quantity"];
+    $this->ship_date = $data["ship_date"];
+    $this->status = $data["status"];
+    $this->complete = $data["complete"];
+  }
+
+  public function offsetExists($offset) {
+    return isset($this->$offset);
+  }
+
+  public function offsetGet($offset) {
+    return $this->$offset;
+  }
+
+  public function offsetSet($offset, $value) {
+    $this->$offset = $value;
+  }
+
+  public function offsetUnset($offset) {
+    unset($this->$offset);
+  }
+}
diff --git a/samples/client/petstore/php/models/Pet.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php
similarity index 93%
rename from samples/client/petstore/php/models/Pet.php
rename to samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php
index e980d858a2f..d2014f3fa34 100644
--- a/samples/client/petstore/php/models/Pet.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Pet.php
@@ -16,13 +16,17 @@
  */
 
 /**
- * $model.description$
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
  *
  */
 
-class pet implements ArrayAccess {
+namespace SwaggerClient\models;
+
+use \ArrayAccess;
+
+class Pet implements ArrayAccess {
   static $swaggerTypes = array(
       'id' => 'int',
       'category' => 'Category',
@@ -52,7 +56,7 @@ class pet implements ArrayAccess {
   */
   public $status; /* string */
 
-  public function __construct(array $data) {
+  public function __construct(array $data = null) {
     $this->id = $data["id"];
     $this->category = $data["category"];
     $this->name = $data["name"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php
new file mode 100644
index 00000000000..4a87c0626f1
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/Tag.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ *  Copyright 2015 Reverb Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+ *
+ */
+
+namespace SwaggerClient\models;
+
+use \ArrayAccess;
+
+class Tag implements ArrayAccess {
+  static $swaggerTypes = array(
+      'id' => 'int',
+      'name' => 'string'
+  );
+
+  static $attributeMap = array(
+      'id' => 'id',
+      'name' => 'name'
+  );
+
+  
+  public $id; /* int */
+  public $name; /* string */
+
+  public function __construct(array $data = null) {
+    $this->id = $data["id"];
+    $this->name = $data["name"];
+  }
+
+  public function offsetExists($offset) {
+    return isset($this->$offset);
+  }
+
+  public function offsetGet($offset) {
+    return $this->$offset;
+  }
+
+  public function offsetSet($offset, $value) {
+    $this->$offset = $value;
+  }
+
+  public function offsetUnset($offset) {
+    unset($this->$offset);
+  }
+}
diff --git a/samples/client/petstore/php/models/User.php b/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php
similarity index 93%
rename from samples/client/petstore/php/models/User.php
rename to samples/client/petstore/php/SwaggerClient-php/lib/models/User.php
index 1ae88e5e2aa..ab8b4a60fc4 100644
--- a/samples/client/petstore/php/models/User.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/models/User.php
@@ -16,13 +16,17 @@
  */
 
 /**
- * $model.description$
+ * 
  *
  * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
  *
  */
 
-class user implements ArrayAccess {
+namespace SwaggerClient\models;
+
+use \ArrayAccess;
+
+class User implements ArrayAccess {
   static $swaggerTypes = array(
       'id' => 'int',
       'username' => 'string',
@@ -58,7 +62,7 @@ class user implements ArrayAccess {
   */
   public $user_status; /* int */
 
-  public function __construct(array $data) {
+  public function __construct(array $data = null) {
     $this->id = $data["id"];
     $this->username = $data["username"];
     $this->first_name = $data["first_name"];
diff --git a/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
new file mode 100644
index 00000000000..3286208ec56
--- /dev/null
+++ b/samples/client/petstore/php/SwaggerClient-php/tests/PetApiTest.php
@@ -0,0 +1,16 @@
+<?php
+require_once('SwaggerClient.php');
+class PetApiTest extends \PHPUnit_Framework_TestCase
+{
+  public function testGetPetById()
+  {
+    // initialize the API client
+    $api_client = new SwaggerClient\APIClient('http://petstore.swagger.io/v2');
+    $petId = 10005;  // ID of pet that needs to be fetched
+    $pet_api = new SwaggerClient\PetAPI($api_client);
+    // return Pet (model)
+    $response = $pet_api->getPetById($petId);
+    $this->assertSame($response->id, $petId);
+  }
+}
+?>
diff --git a/samples/client/petstore/php/UserApi.php b/samples/client/petstore/php/UserApi.php
deleted file mode 100644
index cd5d197394b..00000000000
--- a/samples/client/petstore/php/UserApi.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-/**
- *  Copyright 2015 Reverb Technologies, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
- *
- * NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
- */
-class UserApi {
-
-	function __construct($apiClient) {
-	  $this->apiClient = $apiClient;
-	}
-
-  
-	/**
-	 * createUser
-   *
-	 * Create user
-   * body, User: Created user object (required)
-   * 
-	 * @return 
-	 */
-
-   public function createUser($body) {
-
-  		// parse inputs
-  		$resourcePath = "/user";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "POST";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      
-      
-      // body params
-      $body = null;
-      if (isset($body)) {
-        $body = $body;
-      }
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * createUsersWithArrayInput
-   *
-	 * Creates list of users with given input array
-   * body, array[User]: List of user object (required)
-   * 
-	 * @return 
-	 */
-
-   public function createUsersWithArrayInput($body) {
-
-  		// parse inputs
-  		$resourcePath = "/user/createWithArray";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "POST";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      
-      
-      // body params
-      $body = null;
-      if (isset($body)) {
-        $body = $body;
-      }
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * createUsersWithListInput
-   *
-	 * Creates list of users with given input array
-   * body, array[User]: List of user object (required)
-   * 
-	 * @return 
-	 */
-
-   public function createUsersWithListInput($body) {
-
-  		// parse inputs
-  		$resourcePath = "/user/createWithList";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "POST";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      
-      
-      // body params
-      $body = null;
-      if (isset($body)) {
-        $body = $body;
-      }
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * loginUser
-   *
-	 * Logs user into the system
-   * username, string: The user name for login (required)
-   * * password, string: The password for login in clear text (required)
-   * 
-	 * @return string
-	 */
-
-   public function loginUser($username, $password) {
-
-  		// parse inputs
-  		$resourcePath = "/user/login";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      // query params
-      if($username !== null) {
-  		  $queryParams['username'] = $this->apiClient->toQueryValue($username);
-  		}// query params
-      if($password !== null) {
-  		  $queryParams['password'] = $this->apiClient->toQueryValue($password);
-  		}
-      
-      
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      if(! $response) {
-        return null;
-      }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'string');
-  		return $responseObject;
-  }
-  
-	/**
-	 * logoutUser
-   *
-	 * Logs out current logged in user session
-   
-	 * @return 
-	 */
-
-   public function logoutUser() {
-
-  		// parse inputs
-  		$resourcePath = "/user/logout";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * getUserByName
-   *
-	 * Get user by user name
-   * username, string: The name that needs to be fetched. Use user1 for testing.  (required)
-   * 
-	 * @return User
-	 */
-
-   public function getUserByName($username) {
-
-  		// parse inputs
-  		$resourcePath = "/user/{username}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "GET";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      // path params
-      if($username !== null) {
-  			$resourcePath = str_replace("{" . "username" . "}",
-  			                            $this->apiClient->toPathValue($username), $resourcePath);
-  		}
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      if(! $response) {
-        return null;
-      }
-
-  		$responseObject = $this->apiClient->deserialize($response,
-  		                                                'User');
-  		return $responseObject;
-  }
-  
-	/**
-	 * updateUser
-   *
-	 * Updated user
-   * username, string: name that need to be deleted (required)
-   * * body, User: Updated user object (required)
-   * 
-	 * @return 
-	 */
-
-   public function updateUser($username, $body) {
-
-  		// parse inputs
-  		$resourcePath = "/user/{username}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "PUT";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      // path params
-      if($username !== null) {
-  			$resourcePath = str_replace("{" . "username" . "}",
-  			                            $this->apiClient->toPathValue($username), $resourcePath);
-  		}
-      
-      // body params
-      $body = null;
-      if (isset($body)) {
-        $body = $body;
-      }
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-	/**
-	 * deleteUser
-   *
-	 * Delete user
-   * username, string: The name that needs to be deleted (required)
-   * 
-	 * @return 
-	 */
-
-   public function deleteUser($username) {
-
-  		// parse inputs
-  		$resourcePath = "/user/{username}";
-  		$resourcePath = str_replace("{format}", "json", $resourcePath);
-  		$method = "DELETE";
-      $queryParams = array();
-      $headerParams = array();
-      $formParams = array();
-      $headerParams['Accept'] = 'application/json,application/xml';
-      $headerParams['Content-Type'] = '';
-
-      
-      
-      // path params
-      if($username !== null) {
-  			$resourcePath = str_replace("{" . "username" . "}",
-  			                            $this->apiClient->toPathValue($username), $resourcePath);
-  		}
-      
-      
-
-      // for HTTP post (form)
-      $body = $body ?: $formParams;
-
-      if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
-        $body = http_build_query($body);
-      }
-
-  		// make the API Call
-  		$response = $this->apiClient->callAPI($resourcePath, $method,
-  		                                      $queryParams, $body,
-  		                                      $headerParams);
-
-      
-  }
-  
-
-}
diff --git a/samples/client/petstore/php/test.php b/samples/client/petstore/php/test.php
new file mode 100644
index 00000000000..7cbbfce3cbb
--- /dev/null
+++ b/samples/client/petstore/php/test.php
@@ -0,0 +1,17 @@
+<?php
+//require_once('vendor/autoload.php');
+require_once('SwaggerClient-php/SwaggerClient.php');
+
+// initialize the API client
+$api_client = new SwaggerClient\APIClient('http://petstore.swagger.io/v2');
+$petId = 10005; // ID of pet that needs to be fetched
+try {
+    $pet_api = new SwaggerClient\PetAPI($api_client);
+    // return Pet (model)
+    $response = $pet_api->getPetById($petId);
+    var_dump($response);
+} catch (Exception $e) {
+    echo 'Caught exception: ', $e->getMessage(), "\n";
+}
+
+?>
diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md
deleted file mode 100644
index cf1f7142bc0..00000000000
--- a/samples/client/petstore/python/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Swagger Generated Python client
-
-
-Usage example, based on the swagger petstore:
-
-```python
-# include the client module
-from client import *
-
-# build a client connection.  In this example, we are passing the hostname as arg0, and
-# sending a header with name `api_key` and value `special-key` on each call to the api.
-
-client = swagger.ApiClient('http://petstore.swagger.io/v2', 'api_key', 'special-key')
-
-# create the PetApi class with the client we just created
-petApi = PetApi.PetApi(client)
-
-# call the API and fetch a pet, with petId=3
-pet = petApi.getPetById(petId=3)
-
-# write it into pretty JSON
-json = client.sanitizeForSerialization(pet)
-print json
-{'category': {'category': None, 'status': None, 'name': 'string', 'tags': None, 'photoUrls': None, 'id': 0L}, 'status': {'category': None, 'status': None, 'name': None, 'tags': None, 'photoUrls': None, 'id': None}, 'name': 'foogly', 'tags': [{'id': 0L, 'name': 'string'}], 'photoUrls': ['string'], 'id': 3L}
-```
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/README.md b/samples/client/petstore/python/SwaggerPetstore-python/README.md
new file mode 100644
index 00000000000..3b69aba0f82
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/README.md
@@ -0,0 +1,42 @@
+## Requirements.
+Python 2.7 and later.
+
+## Setuptools
+You can install the bindings via [Setuptools](http://pypi.python.org/pypi/setuptools).
+
+```sh
+python setup.py install
+```
+
+Or you can install from Github via pip:
+
+```sh
+pip install git+https://github.com/geekerzp/SwaggerPetstore-python.git
+```
+
+To use the bindings, import the pacakge:
+
+```python
+import SwaggerPetstore
+```
+
+## Manual Installation
+If you do not wish to use setuptools, you can download the latest release.
+Then, to use the bindings, import the package:
+
+```python
+import path.to.SwaggerPetstore-python.SwaggerPetstore
+```
+
+## Getting Started
+
+TODO
+
+## Documentation
+
+TODO
+
+## Tests
+
+TODO
+
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/__init__.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/__init__.py
new file mode 100644
index 00000000000..30d634bc4b3
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/__init__.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+"""Add all of the modules in the current directory to __all__"""
+import os
+
+# import models into package
+
+from .models.user import User
+
+from .models.category import Category
+
+from .models.pet import Pet
+
+from .models.tag import Tag
+
+from .models.order import Order
+
+
+# import apis into package
+
+from .user_api import UserApi
+
+from .pet_api import PetApi
+
+from .store_api import StoreApi
+
+
+# import ApiClient
+from .swagger import ApiClient
+
+__all__ = []
+
+for module in os.listdir(os.path.dirname(__file__)):
+  if module != '__init__.py' and module[-3:] == '.py':
+    __all__.append(module[:-3])
diff --git a/samples/client/petstore/python/client/__init__.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/__init__.py
similarity index 66%
rename from samples/client/petstore/python/client/__init__.py
rename to samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/__init__.py
index 728aacbb9ab..ce94c72a70c 100644
--- a/samples/client/petstore/python/client/__init__.py
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/__init__.py
@@ -2,6 +2,18 @@
 """Add all of the modules in the current directory to __all__"""
 import os
 
+
+from .user import User
+
+from .category import Category
+
+from .pet import Pet
+
+from .tag import Tag
+
+from .order import Order
+
+
 __all__ = []
 
 for module in os.listdir(os.path.dirname(__file__)):
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py
new file mode 100644
index 00000000000..7b41a32a7d7
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/category.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+Copyright 2015 Reverb Technologies, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+
+class Category(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually."""
+
+
+    def __init__(self):
+        """
+        Attributes:
+          swaggerTypes (dict): The key is attribute name and the value is attribute type.
+          attributeMap (dict): The key is attribute name and the value is json key in definition.
+        """
+        self.swaggerTypes = {
+            
+            'id': 'long',
+            
+            
+            'name': 'str'
+            
+        }
+
+        self.attributeMap = {
+            
+            'id': 'id',
+            
+            'name': 'name'
+            
+        }
+
+        
+        
+        self.id = None # long
+        
+        
+        self.name = None # str
+        
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py
new file mode 100644
index 00000000000..84780db3780
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/order.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+Copyright 2015 Reverb Technologies, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+
+class Order(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually."""
+
+
+    def __init__(self):
+        """
+        Attributes:
+          swaggerTypes (dict): The key is attribute name and the value is attribute type.
+          attributeMap (dict): The key is attribute name and the value is json key in definition.
+        """
+        self.swaggerTypes = {
+            
+            'id': 'long',
+            
+            
+            'pet_id': 'long',
+            
+            
+            'quantity': 'int',
+            
+            
+            'ship_date': 'DateTime',
+            
+            
+            'status': 'str',
+            
+            
+            'complete': 'bool'
+            
+        }
+
+        self.attributeMap = {
+            
+            'id': 'id',
+            
+            'pet_id': 'petId',
+            
+            'quantity': 'quantity',
+            
+            'ship_date': 'shipDate',
+            
+            'status': 'status',
+            
+            'complete': 'complete'
+            
+        }
+
+        
+        
+        self.id = None # long
+        
+        
+        self.pet_id = None # long
+        
+        
+        self.quantity = None # int
+        
+        
+        self.ship_date = None # DateTime
+        
+        #Order Status
+        
+        self.status = None # str
+        
+        
+        self.complete = None # bool
+        
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py
new file mode 100644
index 00000000000..1415d6f8535
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/pet.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+Copyright 2015 Reverb Technologies, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+
+class Pet(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually."""
+
+
+    def __init__(self):
+        """
+        Attributes:
+          swaggerTypes (dict): The key is attribute name and the value is attribute type.
+          attributeMap (dict): The key is attribute name and the value is json key in definition.
+        """
+        self.swaggerTypes = {
+            
+            'id': 'long',
+            
+            
+            'category': 'Category',
+            
+            
+            'name': 'str',
+            
+            
+            'photo_urls': 'list[str]',
+            
+            
+            'tags': 'list[Tag]',
+            
+            
+            'status': 'str'
+            
+        }
+
+        self.attributeMap = {
+            
+            'id': 'id',
+            
+            'category': 'category',
+            
+            'name': 'name',
+            
+            'photo_urls': 'photoUrls',
+            
+            'tags': 'tags',
+            
+            'status': 'status'
+            
+        }
+
+        
+        
+        self.id = None # long
+        
+        
+        self.category = None # Category
+        
+        
+        self.name = None # str
+        
+        
+        self.photo_urls = None # list[str]
+        
+        
+        self.tags = None # list[Tag]
+        
+        #pet status in the store
+        
+        self.status = None # str
+        
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py
new file mode 100644
index 00000000000..a6ed3083422
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/tag.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+Copyright 2015 Reverb Technologies, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+
+class Tag(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually."""
+
+
+    def __init__(self):
+        """
+        Attributes:
+          swaggerTypes (dict): The key is attribute name and the value is attribute type.
+          attributeMap (dict): The key is attribute name and the value is json key in definition.
+        """
+        self.swaggerTypes = {
+            
+            'id': 'long',
+            
+            
+            'name': 'str'
+            
+        }
+
+        self.attributeMap = {
+            
+            'id': 'id',
+            
+            'name': 'name'
+            
+        }
+
+        
+        
+        self.id = None # long
+        
+        
+        self.name = None # str
+        
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py
new file mode 100644
index 00000000000..8559b331203
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/models/user.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+Copyright 2015 Reverb Technologies, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+
+class User(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+    Do not edit the class manually."""
+
+
+    def __init__(self):
+        """
+        Attributes:
+          swaggerTypes (dict): The key is attribute name and the value is attribute type.
+          attributeMap (dict): The key is attribute name and the value is json key in definition.
+        """
+        self.swaggerTypes = {
+            
+            'id': 'long',
+            
+            
+            'username': 'str',
+            
+            
+            'first_name': 'str',
+            
+            
+            'last_name': 'str',
+            
+            
+            'email': 'str',
+            
+            
+            'password': 'str',
+            
+            
+            'phone': 'str',
+            
+            
+            'user_status': 'int'
+            
+        }
+
+        self.attributeMap = {
+            
+            'id': 'id',
+            
+            'username': 'username',
+            
+            'first_name': 'firstName',
+            
+            'last_name': 'lastName',
+            
+            'email': 'email',
+            
+            'password': 'password',
+            
+            'phone': 'phone',
+            
+            'user_status': 'userStatus'
+            
+        }
+
+        
+        
+        self.id = None # long
+        
+        
+        self.username = None # str
+        
+        
+        self.first_name = None # str
+        
+        
+        self.last_name = None # str
+        
+        
+        self.email = None # str
+        
+        
+        self.password = None # str
+        
+        
+        self.phone = None # str
+        
+        #User Status
+        
+        self.user_status = None # int
+        
diff --git a/samples/client/petstore/python/client/PetApi.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/pet_api.py
similarity index 72%
rename from samples/client/petstore/python/client/PetApi.py
rename to samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/pet_api.py
index 4b99f62a935..d842c2f0a0f 100644
--- a/samples/client/petstore/python/client/PetApi.py
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/pet_api.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# coding: utf-8
+
 """
 PetApi.py
 Copyright 2015 Reverb Technologies, Inc.
@@ -19,6 +21,7 @@ NOTE: This class is auto generated by the swagger code generator program. Do not
 """
 import sys
 import os
+import urllib
 
 from models import *
 
@@ -30,15 +33,14 @@ class PetApi(object):
 
     
     
-    def updatePet(self, **kwargs):
+    def update_pet(self, **kwargs):
         """Update an existing pet
+        
 
         Args:
-            
             body, Pet: Pet object that needs to be added to the store (required)
             
-            
-        
+
         Returns: 
         """
 
@@ -47,7 +49,7 @@ class PetApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method updatePet" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method update_pet" % key)
             params[key] = val
         del params['kwargs']
 
@@ -61,8 +63,11 @@ class PetApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = 'application/json,application/xml';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = ['application/json', 'application/xml', ]
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -86,15 +91,14 @@ class PetApi(object):
         
         
     
-    def addPet(self, **kwargs):
+    def add_pet(self, **kwargs):
         """Add a new pet to the store
+        
 
         Args:
-            
             body, Pet: Pet object that needs to be added to the store (required)
             
-            
-        
+
         Returns: 
         """
 
@@ -103,7 +107,7 @@ class PetApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method addPet" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method add_pet" % key)
             params[key] = val
         del params['kwargs']
 
@@ -117,8 +121,11 @@ class PetApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = 'application/json,application/xml';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = ['application/json', 'application/xml', ]
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -142,15 +149,14 @@ class PetApi(object):
         
         
     
-    def findPetsByStatus(self, **kwargs):
+    def find_pets_by_status(self, **kwargs):
         """Finds Pets by status
+        Multiple status values can be provided with comma seperated strings
 
         Args:
-            
             status, list[str]: Status values that need to be considered for filter (required)
             
-            
-        
+
         Returns: list[Pet]
         """
 
@@ -159,7 +165,7 @@ class PetApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method findPetsByStatus" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_status" % key)
             params[key] = val
         del params['kwargs']
 
@@ -173,8 +179,11 @@ class PetApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
         if ('status' in params):
@@ -204,15 +213,14 @@ class PetApi(object):
         
         
     
-    def findPetsByTags(self, **kwargs):
+    def find_pets_by_tags(self, **kwargs):
         """Finds Pets by tags
+        Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
 
         Args:
-            
             tags, list[str]: Tags to filter by (required)
             
-            
-        
+
         Returns: list[Pet]
         """
 
@@ -221,7 +229,7 @@ class PetApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method findPetsByTags" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_tags" % key)
             params[key] = val
         del params['kwargs']
 
@@ -235,8 +243,11 @@ class PetApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
         if ('tags' in params):
@@ -266,24 +277,23 @@ class PetApi(object):
         
         
     
-    def getPetById(self, **kwargs):
+    def get_pet_by_id(self, **kwargs):
         """Find pet by ID
+        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
 
         Args:
+            pet_id, long: ID of pet that needs to be fetched (required)
             
-            petId, long: ID of pet that needs to be fetched (required)
-            
-            
-        
+
         Returns: Pet
         """
 
-        allParams = ['petId']
+        allParams = ['pet_id']
 
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method getPetById" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method get_pet_by_id" % key)
             params[key] = val
         del params['kwargs']
 
@@ -297,16 +307,20 @@ class PetApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
         
 
         
-        if ('petId' in params):
-            replacement = str(self.apiClient.toPathValue(params['petId']))
+        if ('pet_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['pet_id']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'petId' + '}',
                                                 replacement)
         
@@ -330,30 +344,25 @@ class PetApi(object):
         
         
     
-    def updatePetWithForm(self, **kwargs):
+    def update_pet_with_form(self, **kwargs):
         """Updates a pet in the store with form data
+        
 
         Args:
-            
-            petId, str: ID of pet that needs to be updated (required)
-            
-            
+            pet_id, str: ID of pet that needs to be updated (required)
             name, str: Updated name of the pet (required)
-            
-            
             status, str: Updated status of the pet (required)
             
-            
-        
+
         Returns: 
         """
 
-        allParams = ['petId', 'name', 'status']
+        allParams = ['pet_id', 'name', 'status']
 
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method updatePetWithForm" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method update_pet_with_form" % key)
             params[key] = val
         del params['kwargs']
 
@@ -367,16 +376,20 @@ class PetApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = 'application/x-www-form-urlencoded';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = ['application/x-www-form-urlencoded', ]
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
         
 
         
-        if ('petId' in params):
-            replacement = str(self.apiClient.toPathValue(params['petId']))
+        if ('pet_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['pet_id']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'petId' + '}',
                                                 replacement)
         
@@ -400,27 +413,24 @@ class PetApi(object):
         
         
     
-    def deletePet(self, **kwargs):
+    def delete_pet(self, **kwargs):
         """Deletes a pet
+        
 
         Args:
-            
             api_key, str:  (required)
+            pet_id, long: Pet id to delete (required)
             
-            
-            petId, long: Pet id to delete (required)
-            
-            
-        
+
         Returns: 
         """
 
-        allParams = ['api_key', 'petId']
+        allParams = ['api_key', 'pet_id']
 
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method deletePet" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method delete_pet" % key)
             params[key] = val
         del params['kwargs']
 
@@ -434,8 +444,11 @@ class PetApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -445,8 +458,9 @@ class PetApi(object):
         
 
         
-        if ('petId' in params):
-            replacement = str(self.apiClient.toPathValue(params['petId']))
+        if ('pet_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['pet_id']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'petId' + '}',
                                                 replacement)
         
@@ -464,30 +478,25 @@ class PetApi(object):
         
         
     
-    def uploadFile(self, **kwargs):
+    def upload_file(self, **kwargs):
         """uploads an image
+        
 
         Args:
-            
-            petId, long: ID of pet to update (required)
-            
-            
-            additionalMetadata, str: Additional data to pass to server (required)
-            
-            
+            pet_id, long: ID of pet to update (required)
+            additional_metadata, str: Additional data to pass to server (required)
             file, file: file to upload (required)
             
-            
-        
+
         Returns: 
         """
 
-        allParams = ['petId', 'additionalMetadata', 'file']
+        allParams = ['pet_id', 'additional_metadata', 'file']
 
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method uploadFile" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method upload_file" % key)
             params[key] = val
         del params['kwargs']
 
@@ -501,23 +510,27 @@ class PetApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = 'multipart/form-data';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = ['multipart/form-data', ]
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
         
 
         
-        if ('petId' in params):
-            replacement = str(self.apiClient.toPathValue(params['petId']))
+        if ('pet_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['pet_id']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'petId' + '}',
                                                 replacement)
         
 
         
-        if ('additionalMetadata' in params):
-            formParams['additionalMetadata'] = params['additionalMetadata']
+        if ('additional_metadata' in params):
+            formParams['additionalMetadata'] = params['additional_metadata']
         
         if ('file' in params):
             files['file'] = params['file']
diff --git a/samples/client/petstore/python/client/StoreApi.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/store_api.py
similarity index 73%
rename from samples/client/petstore/python/client/StoreApi.py
rename to samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/store_api.py
index f47a4408cbb..b2de83e85da 100644
--- a/samples/client/petstore/python/client/StoreApi.py
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/store_api.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# coding: utf-8
+
 """
 StoreApi.py
 Copyright 2015 Reverb Technologies, Inc.
@@ -19,6 +21,7 @@ NOTE: This class is auto generated by the swagger code generator program. Do not
 """
 import sys
 import os
+import urllib
 
 from models import *
 
@@ -30,12 +33,13 @@ class StoreApi(object):
 
     
     
-    def getInventory(self, **kwargs):
+    def get_inventory(self, **kwargs):
         """Returns pet inventories by status
+        Returns a map of status codes to quantities
 
         Args:
             
-        
+
         Returns: map(String, int)
         """
 
@@ -44,7 +48,7 @@ class StoreApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method getInventory" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method get_inventory" % key)
             params[key] = val
         del params['kwargs']
 
@@ -58,8 +62,11 @@ class StoreApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -86,15 +93,14 @@ class StoreApi(object):
         
         
     
-    def placeOrder(self, **kwargs):
+    def place_order(self, **kwargs):
         """Place an order for a pet
+        
 
         Args:
-            
             body, Order: order placed for purchasing the pet (required)
             
-            
-        
+
         Returns: Order
         """
 
@@ -103,7 +109,7 @@ class StoreApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method placeOrder" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method place_order" % key)
             params[key] = val
         del params['kwargs']
 
@@ -117,8 +123,11 @@ class StoreApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -148,24 +157,23 @@ class StoreApi(object):
         
         
     
-    def getOrderById(self, **kwargs):
+    def get_order_by_id(self, **kwargs):
         """Find purchase order by ID
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
 
         Args:
+            order_id, str: ID of pet that needs to be fetched (required)
             
-            orderId, str: ID of pet that needs to be fetched (required)
-            
-            
-        
+
         Returns: Order
         """
 
-        allParams = ['orderId']
+        allParams = ['order_id']
 
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method getOrderById" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method get_order_by_id" % key)
             params[key] = val
         del params['kwargs']
 
@@ -179,16 +187,20 @@ class StoreApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
         
 
         
-        if ('orderId' in params):
-            replacement = str(self.apiClient.toPathValue(params['orderId']))
+        if ('order_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['order_id']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'orderId' + '}',
                                                 replacement)
         
@@ -212,24 +224,23 @@ class StoreApi(object):
         
         
     
-    def deleteOrder(self, **kwargs):
+    def delete_order(self, **kwargs):
         """Delete purchase order by ID
+        For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
 
         Args:
+            order_id, str: ID of the order that needs to be deleted (required)
             
-            orderId, str: ID of the order that needs to be deleted (required)
-            
-            
-        
+
         Returns: 
         """
 
-        allParams = ['orderId']
+        allParams = ['order_id']
 
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method deleteOrder" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method delete_order" % key)
             params[key] = val
         del params['kwargs']
 
@@ -243,16 +254,20 @@ class StoreApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
         
 
         
-        if ('orderId' in params):
-            replacement = str(self.apiClient.toPathValue(params['orderId']))
+        if ('order_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['order_id']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'orderId' + '}',
                                                 replacement)
         
diff --git a/samples/client/petstore/python/client/swagger.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/swagger.py
similarity index 63%
rename from samples/client/petstore/python/client/swagger.py
rename to samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/swagger.py
index 8d9053025d1..10ac54d527d 100644
--- a/samples/client/petstore/python/client/swagger.py
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/swagger.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# coding: utf-8
+
 """Swagger generic API client. This client handles the client-
 server communication, and is invariant across implementations. Specifics of
 the methods and models for each application are generated from the Swagger
@@ -15,11 +17,10 @@ import datetime
 import mimetypes
 import random
 import string
-
-from models import *
+import models
 
 
-class ApiClient:
+class ApiClient(object):
   """Generic API client for Swagger client library builds
 
   Attributes:
@@ -28,26 +29,40 @@ class ApiClient:
     headerValue: a header value to pass when making calls to the API
   """
   def __init__(self, host=None, headerName=None, headerValue=None):
-    self.headerName = headerName
-    self.headerValue = headerValue
+    self.defaultHeaders = {}
+    if (headerName is not None):
+      self.defaultHeaders[headerName] = headerValue
     self.host = host
     self.cookie = None
     self.boundary = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(30))
+    # Set default User-Agent.
+    self.user_agent = 'Python-Swagger'
+
+  @property
+  def user_agent(self):
+    return self.defaultHeaders['User-Agent']
+
+  @user_agent.setter
+  def user_agent(self, value):
+    self.defaultHeaders['User-Agent'] = value
+
+  def setDefaultHeader(self, headerName, headerValue):
+    self.defaultHeaders[headerName] = headerValue
 
   def callAPI(self, resourcePath, method, queryParams, postData,
               headerParams=None, files=None):
 
     url = self.host + resourcePath
-    headers = {}
-    if headerParams:
-      for param, value in headerParams.iteritems():
-        headers[param] = value
 
-    if self.headerName:
-      headers[self.headerName] = self.headerValue
+    mergedHeaderParams = self.defaultHeaders.copy()
+    mergedHeaderParams.update(headerParams)
+    headers = {}
+    if mergedHeaderParams:
+      for param, value in mergedHeaderParams.iteritems():
+        headers[param] = ApiClient.sanitizeForSerialization(value)
 
     if self.cookie:
-      headers['Cookie'] = self.cookie
+      headers['Cookie'] = ApiClient.sanitizeForSerialization(self.cookie)
 
     data = None
 
@@ -55,8 +70,8 @@ class ApiClient:
       # Need to remove None values, these should not be sent
       sentQueryParams = {}
       for param, value in queryParams.items():
-        if value != None:
-          sentQueryParams[param] = value
+        if value is not None:
+          sentQueryParams[param] = ApiClient.sanitizeForSerialization(value)
       url = url + '?' + urllib.urlencode(sentQueryParams)
 
     if method in ['GET']:
@@ -65,13 +80,15 @@ class ApiClient:
 
     elif method in ['POST', 'PUT', 'DELETE']:
       if postData:
-        postData = self.sanitizeForSerialization(postData)
-        if 'Content-type' not in headers:
-          headers['Content-type'] = 'application/json'
+        postData = ApiClient.sanitizeForSerialization(postData)
+        if 'Content-Type' not in headers:
+          headers['Content-Type'] = 'application/json'
           data = json.dumps(postData)
-        elif headers['Content-type'] == 'multipart/form-data':
+        elif headers['Content-Type'] == 'application/json':
+          data = json.dumps(postData)
+        elif headers['Content-Type'] == 'multipart/form-data':
           data = self.buildMultipartFormData(postData, files)
-          headers['Content-type'] = 'multipart/form-data; boundary={0}'.format(self.boundary)
+          headers['Content-Type'] = 'multipart/form-data; boundary={0}'.format(self.boundary)
           headers['Content-length'] = str(len(data))
         else:
             data = urllib.urlencode(postData)
@@ -103,38 +120,42 @@ class ApiClient:
         string -- quoted value
     """
     if type(obj) == list:
-      return urllib.quote(','.join(obj))
+      return ','.join(obj)
     else:
-      return urllib.quote(str(obj))
+      return str(obj)
 
-  def sanitizeForSerialization(self, obj):
-    """Dump an object into JSON for POSTing."""
+  @staticmethod
+  def sanitizeForSerialization(obj):
+    """
+    Sanitize an object for Request.
 
-    if type(obj) == type(None):
+    If obj is None, return None.
+    If obj is str, int, long, float, bool, return directly.
+    If obj is datetime.datetime, datetime.date convert to string in iso8601 format.
+    If obj is list, santize each element in the list.
+    If obj is dict, return the dict.
+    If obj is swagger model, return the properties dict.
+    """
+    if isinstance(obj, type(None)):
       return None
-    elif type(obj) in [str, int, long, float, bool]:
+    elif isinstance(obj, (str, int, long, float, bool, file)):
       return obj
-    elif type(obj) == list:
-      return [self.sanitizeForSerialization(subObj) for subObj in obj]
-    elif type(obj) == datetime.datetime:
+    elif isinstance(obj, list):
+      return [ApiClient.sanitizeForSerialization(subObj) for subObj in obj]
+    elif isinstance(obj, (datetime.datetime, datetime.date)):
       return obj.isoformat()
     else:
-      if type(obj) == dict:
+      if isinstance(obj, dict):
         objDict = obj
       else:
-        objDict = obj.__dict__
-      return {key: self.sanitizeForSerialization(val)
-        for (key, val) in objDict.iteritems()
-        if key != 'swaggerTypes'}
-
-    if type(postData) == list:
-      # Could be a list of objects
-      if type(postData[0]) in safeToDump:
-        data = json.dumps(postData)
-      else:
-        data = json.dumps([datum.__dict__ for datum in postData])
-    elif type(postData) not in safeToDump:
-      data = json.dumps(postData.__dict__)
+        # Convert model obj to dict except attributes `swaggerTypes`, `attributeMap`
+        # and attributes which value is not None.
+        # Convert attribute name to json key in model definition for request.
+        objDict = {obj.attributeMap[key]: val
+                   for key, val in obj.__dict__.iteritems()
+                   if key != 'swaggerTypes' and key != 'attributeMap' and val is not None}
+      return {key: ApiClient.sanitizeForSerialization(val)
+              for (key, val) in objDict.iteritems()}
 
   def buildMultipartFormData(self, postData, files):
     def escape_quotes(s):
@@ -189,21 +210,18 @@ class ApiClient:
       if (objClass in ['int', 'float', 'long', 'dict', 'list', 'str', 'bool', 'datetime']):
         objClass = eval(objClass)
       else:  # not a native type, must be model class
-        objClass = eval(objClass + '.' + objClass)
+        objClass = eval('models.' + objClass)
 
     if objClass in [int, long, float, dict, list, str, bool]:
       return objClass(obj)
     elif objClass == datetime:
-      # Server will always return a time stamp in UTC, but with
-      # trailing +0000 indicating no offset from UTC. So don't process
-      # last 5 characters.
-      return datetime.datetime.strptime(obj[:-5], "%Y-%m-%dT%H:%M:%S.%f")
+      return self.__parse_string_to_datetime(obj)
 
     instance = objClass()
 
     for attr, attrType in instance.swaggerTypes.iteritems():
-        if obj is not None and attr in obj and type(obj) in [list, dict]:
-          value = obj[attr]
+        if obj is not None and instance.attributeMap[attr] in obj and type(obj) in [list, dict]:
+          value = obj[instance.attributeMap[attr]]
           if attrType in ['str', 'int', 'long', 'float', 'bool']:
             attrType = eval(attrType)
             try:
@@ -214,7 +232,7 @@ class ApiClient:
               value = value
             setattr(instance, attr, value)
           elif (attrType == 'datetime'):
-            setattr(instance, attr, datetime.datetime.strptime(value[:-5], "%Y-%m-%dT%H:%M:%S.%f"))
+            setattr(instance, attr, self.__parse_string_to_datetime(value))
           elif 'list[' in attrType:
             match = re.match('list\[(.*)\]', attrType)
             subClass = match.group(1)
@@ -226,10 +244,21 @@ class ApiClient:
                 subValues.append(self.deserialize(subValue, subClass))
             setattr(instance, attr, subValues)
           else:
-            setattr(instance, attr, self.deserialize(value, objClass))
+            setattr(instance, attr, self.deserialize(value, attrType))
 
     return instance
 
+  def __parse_string_to_datetime(self, string):
+    """
+    Parse datetime in string to datetime.
+
+    The string should be in iso8601 datetime format.
+    """
+    try:
+        from dateutil.parser import parse
+        return parse(string)
+    except ImportError:
+        return string
 
 class MethodRequest(urllib2.Request):
   def __init__(self, *args, **kwargs):
@@ -243,4 +272,4 @@ class MethodRequest(urllib2.Request):
     return urllib2.Request.__init__(self, *args, **kwargs)
 
   def get_method(self):
-    return getattr(self, 'method', urllib2.Request.get_method(self))
\ No newline at end of file
+    return getattr(self, 'method', urllib2.Request.get_method(self))
diff --git a/samples/client/petstore/python/client/UserApi.py b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/user_api.py
similarity index 77%
rename from samples/client/petstore/python/client/UserApi.py
rename to samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/user_api.py
index a357b785c57..d36a95514bd 100644
--- a/samples/client/petstore/python/client/UserApi.py
+++ b/samples/client/petstore/python/SwaggerPetstore-python/SwaggerPetstore/user_api.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# coding: utf-8
+
 """
 UserApi.py
 Copyright 2015 Reverb Technologies, Inc.
@@ -19,6 +21,7 @@ NOTE: This class is auto generated by the swagger code generator program. Do not
 """
 import sys
 import os
+import urllib
 
 from models import *
 
@@ -30,15 +33,14 @@ class UserApi(object):
 
     
     
-    def createUser(self, **kwargs):
+    def create_user(self, **kwargs):
         """Create user
+        This can only be done by the logged in user.
 
         Args:
-            
             body, User: Created user object (required)
             
-            
-        
+
         Returns: 
         """
 
@@ -47,7 +49,7 @@ class UserApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method createUser" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method create_user" % key)
             params[key] = val
         del params['kwargs']
 
@@ -61,8 +63,11 @@ class UserApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -86,15 +91,14 @@ class UserApi(object):
         
         
     
-    def createUsersWithArrayInput(self, **kwargs):
+    def create_users_with_array_input(self, **kwargs):
         """Creates list of users with given input array
+        
 
         Args:
-            
             body, list[User]: List of user object (required)
             
-            
-        
+
         Returns: 
         """
 
@@ -103,7 +107,7 @@ class UserApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method createUsersWithArrayInput" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_array_input" % key)
             params[key] = val
         del params['kwargs']
 
@@ -117,8 +121,11 @@ class UserApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -142,15 +149,14 @@ class UserApi(object):
         
         
     
-    def createUsersWithListInput(self, **kwargs):
+    def create_users_with_list_input(self, **kwargs):
         """Creates list of users with given input array
+        
 
         Args:
-            
             body, list[User]: List of user object (required)
             
-            
-        
+
         Returns: 
         """
 
@@ -159,7 +165,7 @@ class UserApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method createUsersWithListInput" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_list_input" % key)
             params[key] = val
         del params['kwargs']
 
@@ -173,8 +179,11 @@ class UserApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -198,18 +207,15 @@ class UserApi(object):
         
         
     
-    def loginUser(self, **kwargs):
+    def login_user(self, **kwargs):
         """Logs user into the system
+        
 
         Args:
-            
             username, str: The user name for login (required)
-            
-            
             password, str: The password for login in clear text (required)
             
-            
-        
+
         Returns: str
         """
 
@@ -218,7 +224,7 @@ class UserApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method loginUser" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method login_user" % key)
             params[key] = val
         del params['kwargs']
 
@@ -232,8 +238,11 @@ class UserApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
         if ('username' in params):
@@ -266,12 +275,13 @@ class UserApi(object):
         
         
     
-    def logoutUser(self, **kwargs):
+    def logout_user(self, **kwargs):
         """Logs out current logged in user session
+        
 
         Args:
             
-        
+
         Returns: 
         """
 
@@ -280,7 +290,7 @@ class UserApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method logoutUser" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method logout_user" % key)
             params[key] = val
         del params['kwargs']
 
@@ -294,8 +304,11 @@ class UserApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -316,15 +329,14 @@ class UserApi(object):
         
         
     
-    def getUserByName(self, **kwargs):
+    def get_user_by_name(self, **kwargs):
         """Get user by user name
+        
 
         Args:
-            
             username, str: The name that needs to be fetched. Use user1 for testing.  (required)
             
-            
-        
+
         Returns: User
         """
 
@@ -333,7 +345,7 @@ class UserApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method getUserByName" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method get_user_by_name" % key)
             params[key] = val
         del params['kwargs']
 
@@ -347,8 +359,11 @@ class UserApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -357,6 +372,7 @@ class UserApi(object):
         
         if ('username' in params):
             replacement = str(self.apiClient.toPathValue(params['username']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'username' + '}',
                                                 replacement)
         
@@ -380,18 +396,15 @@ class UserApi(object):
         
         
     
-    def updateUser(self, **kwargs):
+    def update_user(self, **kwargs):
         """Updated user
+        This can only be done by the logged in user.
 
         Args:
-            
             username, str: name that need to be deleted (required)
-            
-            
             body, User: Updated user object (required)
             
-            
-        
+
         Returns: 
         """
 
@@ -400,7 +413,7 @@ class UserApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method updateUser" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method update_user" % key)
             params[key] = val
         del params['kwargs']
 
@@ -414,8 +427,11 @@ class UserApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -424,6 +440,7 @@ class UserApi(object):
         
         if ('username' in params):
             replacement = str(self.apiClient.toPathValue(params['username']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'username' + '}',
                                                 replacement)
         
@@ -444,15 +461,14 @@ class UserApi(object):
         
         
     
-    def deleteUser(self, **kwargs):
+    def delete_user(self, **kwargs):
         """Delete user
+        This can only be done by the logged in user.
 
         Args:
-            
             username, str: The name that needs to be deleted (required)
             
-            
-        
+
         Returns: 
         """
 
@@ -461,7 +477,7 @@ class UserApi(object):
         params = locals()
         for (key, val) in params['kwargs'].iteritems():
             if key not in allParams:
-                raise TypeError("Got an unexpected keyword argument '%s' to method deleteUser" % key)
+                raise TypeError("Got an unexpected keyword argument '%s' to method delete_user" % key)
             params[key] = val
         del params['kwargs']
 
@@ -475,8 +491,11 @@ class UserApi(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = 'application/json,application/xml';
-        headerParams['Content-Type'] = '';
+        accepts = ['application/json', 'application/xml']
+        headerParams['Accept'] = ', '.join(accepts)
+
+        content_types = []
+        headerParams['Content-Type'] = content_types[0] if len(content_types) > 0 else 'application/json'
 
         
 
@@ -485,6 +504,7 @@ class UserApi(object):
         
         if ('username' in params):
             replacement = str(self.apiClient.toPathValue(params['username']))
+            replacement = urllib.quote(replacement)
             resourcePath = resourcePath.replace('{' + 'username' + '}',
                                                 replacement)
         
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/pom.xml b/samples/client/petstore/python/SwaggerPetstore-python/pom.xml
new file mode 100644
index 00000000000..c06d3a1cdf6
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/pom.xml
@@ -0,0 +1,72 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.wordnik</groupId>
+  <artifactId>PythonPetstoreClientTests</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>Python Swagger Petstore Client</name>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>nose-install</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>pip</executable>
+              <arguments>
+                <argument>install</argument>
+                <argument>nose</argument>
+                <argument>--user</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>nose-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>nosetests</executable>
+              <arguments>
+                <argument>-v</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/setup.py b/samples/client/petstore/python/SwaggerPetstore-python/setup.py
new file mode 100644
index 00000000000..14d6a73b3b1
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/setup.py
@@ -0,0 +1,32 @@
+import sys
+from setuptools import setup, find_packages
+
+
+
+# To install the library, open a Terminal shell, then run this
+# file by typing:
+#
+# python setup.py install
+#
+# You need to have the setuptools module installed.
+# Try reading the setuptools documentation:
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = []
+
+setup(
+    name="SwaggerPetstore",
+    version="1.0.0",
+    description="Swagger Petstore",
+    author_email="apiteam@wordnik.com",
+    url="",
+    keywords=["Swagger", "Swagger Petstore"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    include_package_data=True,
+    long_description="""\
+    This is a sample server Petstore server.  You can find out more about Swagger at &lt;a href=\&quot;http://swagger.io\&quot;&gt;http://swagger.io&lt;/a&gt; or on irc.freenode.net, #swagger.  For this sample, you can use the api key \&quot;special-key\&quot; to test the authorization filters
+    """
+)
+
+
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/testfiles/foo.png b/samples/client/petstore/python/SwaggerPetstore-python/testfiles/foo.png
new file mode 100644
index 00000000000..a9b12cf5927
Binary files /dev/null and b/samples/client/petstore/python/SwaggerPetstore-python/testfiles/foo.png differ
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/tests/__init__.py b/samples/client/petstore/python/SwaggerPetstore-python/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/samples/client/petstore/python/SwaggerPetstore-python/tests/test_pet_api.py b/samples/client/petstore/python/SwaggerPetstore-python/tests/test_pet_api.py
new file mode 100644
index 00000000000..b6088ae34b9
--- /dev/null
+++ b/samples/client/petstore/python/SwaggerPetstore-python/tests/test_pet_api.py
@@ -0,0 +1,113 @@
+# coding: utf-8
+
+"""
+Run the tests.
+$ pip install nose (optional)
+$ cd SwaggerPetstore-python
+$ nosetests -v
+"""
+
+import os
+import time
+import unittest
+import urllib2
+
+import SwaggerPetstore
+
+HOST = 'http://petstore.swagger.io/v2'
+
+
+class PetApiTests(unittest.TestCase):
+
+    def setUp(self):
+        self.api_client = SwaggerPetstore.ApiClient(HOST)
+        self.pet_api = SwaggerPetstore.PetApi(self.api_client)
+        self.setUpModels()
+        self.setUpFiles()
+
+    def tearDown(self):
+        # sleep 1 sec between two every 2 tests
+        time.sleep(1)
+
+    def setUpModels(self):
+        self.category = SwaggerPetstore.Category()
+        self.category.id = 1010
+        self.category.name = "dog"
+        self.tag = SwaggerPetstore.Tag()
+        self.tag.id = 1010
+        self.tag.name = "blank"
+        self.pet = SwaggerPetstore.Pet()
+        self.pet.id = 1010
+        self.pet.name = "hello kity"
+        self.pet.photo_urls = ["sample urls"]
+        self.pet.status = "sold"
+        self.pet.category = self.category
+        self.pet.tags = [self.tag]
+
+    def setUpFiles(self):
+        self.test_file_dir = os.path.join(os.path.dirname(__file__), "..", "testfiles")
+        self.test_file_dir = os.path.realpath(self.test_file_dir)
+        self.foo = os.path.join(self.test_file_dir, "foo.png")
+
+    def test_1_add_pet(self):
+        try:
+            self.pet_api.add_pet(body=self.pet)
+        except (urllib2.HTTPError, urllib2.URLError) as e:
+            self.fail("add_pet() raised {0} unexpectedly".format(type(e)))
+
+    def test_2_get_pet_by_id(self):
+        self.assertEqual(
+            dir(self.pet_api.get_pet_by_id(pet_id=self.pet.id)),
+            dir(self.pet)
+        )
+
+    def test_3_update_pet(self):
+        try:
+            self.pet.name = "hello kity with updated"
+            self.pet_api.update_pet(body=self.pet)
+        except (urllib2.HTTPError, urllib2.URLError) as e:
+            self.fail("update_pet() raised {0} unexpectedly".format(type(e)))
+
+    def test_4_find_pets_by_status(self):
+        self.assertIn(
+            dir(self.pet),
+            map(dir, self.pet_api.find_pets_by_status(status=["sold"]))
+        )
+
+    def test_5_find_pets_by_tags(self):
+        self.assertIn(
+            dir(self.pet),
+            map(dir, self.pet_api.find_pets_by_tags(tags=["blank"]))
+        )
+
+    def test_6_update_pet_with_form(self):
+        try:
+            name = "hello kity with form updated"
+            status = "pending"
+            self.pet_api.update_pet_with_form(
+                pet_id=self.pet.id, name=name, status=status
+            )
+        except (urllib2.HTTPError, urllib2.URLError) as e:
+            self.fail("update_pet_with_form() raised {0} unexpectedly".format(type(e)))
+
+    def test_7_upload_file(self):
+        try:
+            additional_metadata = "special"
+            self.pet_api.upload_file(
+                pet_id=self.pet.id,
+                additional_metadata=additional_metadata,
+                file=self.foo
+            )
+        except (urllib2.HTTPError, urllib2.URLError) as e:
+            self.fail("upload_file() raised {0} unexpectedly".format(type(e)))
+
+    def test_8_delete_pet(self):
+        try:
+            api_key = "special-key"
+            self.pet_api.delete_pet(pet_id=self.pet.id, api_key=api_key)
+        except (urllib2.HTTPError, urllib2.URLError) as e:
+            self.fail("delete_pet() raised {0} unexpectedly".format(type(e)))
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/samples/client/petstore/python/client/models/__init__.py b/samples/client/petstore/python3/client/__init__.py
similarity index 63%
rename from samples/client/petstore/python/client/models/__init__.py
rename to samples/client/petstore/python3/client/__init__.py
index 728aacbb9ab..4b41ee706c7 100644
--- a/samples/client/petstore/python/client/models/__init__.py
+++ b/samples/client/petstore/python3/client/__init__.py
@@ -5,5 +5,5 @@ import os
 __all__ = []
 
 for module in os.listdir(os.path.dirname(__file__)):
-  if module != '__init__.py' and module[-3:] == '.py':
-    __all__.append(module[:-3])
+    if module != '__init__.py' and module[-3:] == '.py':
+        __all__.append(module[:-3])
diff --git a/samples/client/petstore/python/client/models/Category.py b/samples/client/petstore/python3/client/models/category.py
similarity index 94%
rename from samples/client/petstore/python/client/models/Category.py
rename to samples/client/petstore/python3/client/models/category.py
index 245397c3f1b..a959d5c0af1 100644
--- a/samples/client/petstore/python/client/models/Category.py
+++ b/samples/client/petstore/python3/client/models/category.py
@@ -23,7 +23,7 @@ class Category:
     def __init__(self):
         self.swaggerTypes = {
             
-            'id': 'long',
+            'id': 'int',
             
             
             'name': 'str'
@@ -33,7 +33,7 @@ class Category:
 
         
         
-        self.id = None # long
+        self.id = None # int
         
         
         self.name = None # str
diff --git a/samples/client/petstore/python/client/models/Order.py b/samples/client/petstore/python3/client/models/order.py
similarity index 87%
rename from samples/client/petstore/python/client/models/Order.py
rename to samples/client/petstore/python3/client/models/order.py
index 60bbc0f9913..0e379ae5896 100644
--- a/samples/client/petstore/python/client/models/Order.py
+++ b/samples/client/petstore/python3/client/models/order.py
@@ -23,16 +23,16 @@ class Order:
     def __init__(self):
         self.swaggerTypes = {
             
-            'id': 'long',
+            'id': 'int',
             
             
-            'petId': 'long',
+            'pet_id': 'int',
             
             
             'quantity': 'int',
             
             
-            'shipDate': 'DateTime',
+            'ship_date': 'DateTime',
             
             
             'status': 'str',
@@ -45,16 +45,16 @@ class Order:
 
         
         
-        self.id = None # long
+        self.id = None # int
         
         
-        self.petId = None # long
+        self.pet_id = None # int
         
         
         self.quantity = None # int
         
         
-        self.shipDate = None # DateTime
+        self.ship_date = None # DateTime
         
         #Order Status
         
diff --git a/samples/client/petstore/python/client/models/Pet.py b/samples/client/petstore/python3/client/models/pet.py
similarity index 91%
rename from samples/client/petstore/python/client/models/Pet.py
rename to samples/client/petstore/python3/client/models/pet.py
index c4f024b996c..c65e8996f3e 100644
--- a/samples/client/petstore/python/client/models/Pet.py
+++ b/samples/client/petstore/python3/client/models/pet.py
@@ -23,7 +23,7 @@ class Pet:
     def __init__(self):
         self.swaggerTypes = {
             
-            'id': 'long',
+            'id': 'int',
             
             
             'category': 'Category',
@@ -32,7 +32,7 @@ class Pet:
             'name': 'str',
             
             
-            'photoUrls': 'list[str]',
+            'photo_urls': 'list[str]',
             
             
             'tags': 'list[Tag]',
@@ -45,7 +45,7 @@ class Pet:
 
         
         
-        self.id = None # long
+        self.id = None # int
         
         
         self.category = None # Category
@@ -54,7 +54,7 @@ class Pet:
         self.name = None # str
         
         
-        self.photoUrls = None # list[str]
+        self.photo_urls = None # list[str]
         
         
         self.tags = None # list[Tag]
diff --git a/samples/client/petstore/python/client/models/Tag.py b/samples/client/petstore/python3/client/models/tag.py
similarity index 94%
rename from samples/client/petstore/python/client/models/Tag.py
rename to samples/client/petstore/python3/client/models/tag.py
index bd565e2bab3..e1c52840060 100644
--- a/samples/client/petstore/python/client/models/Tag.py
+++ b/samples/client/petstore/python3/client/models/tag.py
@@ -23,7 +23,7 @@ class Tag:
     def __init__(self):
         self.swaggerTypes = {
             
-            'id': 'long',
+            'id': 'int',
             
             
             'name': 'str'
@@ -33,7 +33,7 @@ class Tag:
 
         
         
-        self.id = None # long
+        self.id = None # int
         
         
         self.name = None # str
diff --git a/samples/client/petstore/python/client/models/User.py b/samples/client/petstore/python3/client/models/user.py
similarity index 84%
rename from samples/client/petstore/python/client/models/User.py
rename to samples/client/petstore/python3/client/models/user.py
index 81466c88530..e0959ae9d41 100644
--- a/samples/client/petstore/python/client/models/User.py
+++ b/samples/client/petstore/python3/client/models/user.py
@@ -23,16 +23,16 @@ class User:
     def __init__(self):
         self.swaggerTypes = {
             
-            'id': 'long',
+            'id': 'int',
             
             
             'username': 'str',
             
             
-            'firstName': 'str',
+            'first_name': 'str',
             
             
-            'lastName': 'str',
+            'last_name': 'str',
             
             
             'email': 'str',
@@ -44,23 +44,23 @@ class User:
             'phone': 'str',
             
             
-            'userStatus': 'int'
+            'user_status': 'int'
             
         }
 
 
         
         
-        self.id = None # long
+        self.id = None # int
         
         
         self.username = None # str
         
         
-        self.firstName = None # str
+        self.first_name = None # str
         
         
-        self.lastName = None # str
+        self.last_name = None # str
         
         
         self.email = None # str
@@ -73,5 +73,5 @@ class User:
         
         #User Status
         
-        self.userStatus = None # int
+        self.user_status = None # int
         
diff --git a/samples/client/petstore/python3/client/pet_api.py b/samples/client/petstore/python3/client/pet_api.py
new file mode 100644
index 00000000000..2f35d07cf95
--- /dev/null
+++ b/samples/client/petstore/python3/client/pet_api.py
@@ -0,0 +1,422 @@
+#!/usr/bin/env python
+"""
+PetApi.py
+Copyright 2015 Reverb Technologies, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+"""
+import sys
+import os
+
+from .models import *
+
+
+class PetApi(object):
+
+    def __init__(self, apiClient):
+      self.apiClient = apiClient
+
+    
+    
+    def update_pet(self, **kwargs):
+        """Update an existing pet
+        
+
+        Args:
+            body, Pet: Pet object that needs to be added to the store (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['body']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method update_pet" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/pet'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'PUT'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def add_pet(self, **kwargs):
+        """Add a new pet to the store
+        
+
+        Args:
+            body, Pet: Pet object that needs to be added to the store (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['body']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method add_pet" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/pet'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'POST'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def find_pets_by_status(self, **kwargs):
+        """Finds Pets by status
+        Multiple status values can be provided with comma seperated strings
+
+        Args:
+            status, list[str]: Status values that need to be considered for filter (required)
+            
+
+        Returns: list[Pet]
+        """
+
+        allParams = ['status']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_status" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/pet/findByStatus'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'GET'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+        if ('status' in params):
+            queryParams['status'] = self.apiClient.toPathValue(params['status'])
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        if not response:
+            return None
+
+        responseObject = self.apiClient.deserialize(response, 'list[Pet]')
+        return responseObject
+        
+        
+        
+    
+    def find_pets_by_tags(self, **kwargs):
+        """Finds Pets by tags
+        Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+
+        Args:
+            tags, list[str]: Tags to filter by (required)
+            
+
+        Returns: list[Pet]
+        """
+
+        allParams = ['tags']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method find_pets_by_tags" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/pet/findByTags'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'GET'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+        if ('tags' in params):
+            queryParams['tags'] = self.apiClient.toPathValue(params['tags'])
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        if not response:
+            return None
+
+        responseObject = self.apiClient.deserialize(response, 'list[Pet]')
+        return responseObject
+        
+        
+        
+    
+    def get_pet_by_id(self, **kwargs):
+        """Find pet by ID
+        Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
+
+        Args:
+            pet_id, int: ID of pet that needs to be fetched (required)
+            
+
+        Returns: Pet
+        """
+
+        allParams = ['pet_id']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method get_pet_by_id" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/pet/{petId}'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'GET'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+        if ('pet_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['pet_id']))
+            resourcePath = resourcePath.replace('{' + 'petId' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        if not response:
+            return None
+
+        responseObject = self.apiClient.deserialize(response, 'Pet')
+        return responseObject
+        
+        
+        
+    
+    def update_pet_with_form(self, **kwargs):
+        """Updates a pet in the store with form data
+        
+
+        Args:
+            pet_id, str: ID of pet that needs to be updated (required)
+            name, str: Updated name of the pet (required)
+            status, str: Updated status of the pet (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['pet_id', 'name', 'status']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method update_pet_with_form" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/pet/{petId}'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'POST'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+        if ('pet_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['pet_id']))
+            resourcePath = resourcePath.replace('{' + 'petId' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def delete_pet(self, **kwargs):
+        """Deletes a pet
+        
+
+        Args:
+            api_key, str:  (required)
+            pet_id, int: Pet id to delete (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['api_key', 'pet_id']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method delete_pet" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/pet/{petId}'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'DELETE'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+        if ('api_key' in params):
+            headerParams['api_key'] = params['api_key']
+        
+
+        
+        if ('pet_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['pet_id']))
+            resourcePath = resourcePath.replace('{' + 'petId' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def upload_file(self, **kwargs):
+        """uploads an image
+        
+
+        Args:
+            pet_id, int: ID of pet to update (required)
+            additional_metadata, str: Additional data to pass to server (required)
+            file, file: file to upload (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['pet_id', 'additional_metadata', 'file']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method upload_file" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/pet/{petId}/uploadImage'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'POST'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+        if ('pet_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['pet_id']))
+            resourcePath = resourcePath.replace('{' + 'petId' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+
+
diff --git a/samples/client/petstore/python3/client/store_api.py b/samples/client/petstore/python3/client/store_api.py
new file mode 100644
index 00000000000..1f57de8ea07
--- /dev/null
+++ b/samples/client/petstore/python3/client/store_api.py
@@ -0,0 +1,229 @@
+#!/usr/bin/env python
+"""
+StoreApi.py
+Copyright 2015 Reverb Technologies, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+"""
+import sys
+import os
+
+from .models import *
+
+
+class StoreApi(object):
+
+    def __init__(self, apiClient):
+      self.apiClient = apiClient
+
+    
+    
+    def get_inventory(self, **kwargs):
+        """Returns pet inventories by status
+        Returns a map of status codes to quantities
+
+        Args:
+            
+
+        Returns: map(String, int)
+        """
+
+        allParams = []
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method get_inventory" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/store/inventory'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'GET'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        if not response:
+            return None
+
+        responseObject = self.apiClient.deserialize(response, 'map(String, int)')
+        return responseObject
+        
+        
+        
+    
+    def place_order(self, **kwargs):
+        """Place an order for a pet
+        
+
+        Args:
+            body, Order: order placed for purchasing the pet (required)
+            
+
+        Returns: Order
+        """
+
+        allParams = ['body']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method place_order" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/store/order'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'POST'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        if not response:
+            return None
+
+        responseObject = self.apiClient.deserialize(response, 'Order')
+        return responseObject
+        
+        
+        
+    
+    def get_order_by_id(self, **kwargs):
+        """Find purchase order by ID
+        For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+        Args:
+            order_id, str: ID of pet that needs to be fetched (required)
+            
+
+        Returns: Order
+        """
+
+        allParams = ['order_id']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method get_order_by_id" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/store/order/{orderId}'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'GET'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+        if ('order_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['order_id']))
+            resourcePath = resourcePath.replace('{' + 'orderId' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        if not response:
+            return None
+
+        responseObject = self.apiClient.deserialize(response, 'Order')
+        return responseObject
+        
+        
+        
+    
+    def delete_order(self, **kwargs):
+        """Delete purchase order by ID
+        For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+        Args:
+            order_id, str: ID of the order that needs to be deleted (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['order_id']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method delete_order" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/store/order/{orderId}'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'DELETE'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+        if ('order_id' in params):
+            replacement = str(self.apiClient.toPathValue(params['order_id']))
+            resourcePath = resourcePath.replace('{' + 'orderId' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+
+
diff --git a/samples/client/petstore/python3/client/swagger.py b/samples/client/petstore/python3/client/swagger.py
new file mode 100644
index 00000000000..f99f0d4d250
--- /dev/null
+++ b/samples/client/petstore/python3/client/swagger.py
@@ -0,0 +1,230 @@
+#!/usr/bin/env python
+"""Wordnik.com's Swagger generic API client. This client handles the client-
+server communication, and is invariant across implementations. Specifics of
+the methods and models for each application are generated from the Swagger
+templates."""
+
+import sys
+import os
+import re
+import urllib.request, urllib.error, urllib.parse
+import http.client
+import json
+import datetime
+
+from .models import *
+
+
+class ApiClient:
+    """Generic API client for Swagger client library builds"""
+
+    def __init__(self, apiKey=None, apiServer=None):
+        if apiKey == None:
+            raise Exception('You must pass an apiKey when instantiating the '
+                            'APIClient')
+        self.apiKey = apiKey
+        self.apiServer = apiServer
+        self.cookie = None
+
+    def callAPI(self, resourcePath, method, queryParams, postData,
+                headerParams=None):
+
+        url = self.apiServer + resourcePath
+        headers = {}
+        if headerParams:
+            for param, value in headerParams.items():
+                headers[param] = value
+
+        #headers['Content-type'] = 'application/json'
+        headers['api_key'] = self.apiKey
+
+        if self.cookie:
+            headers['Cookie'] = self.cookie
+
+        data = None
+
+        if queryParams:
+            # Need to remove None values, these should not be sent
+            sentQueryParams = {}
+            for param, value in queryParams.items():
+                if value != None:
+                    sentQueryParams[param] = value
+            url = url + '?' + urllib.parse.urlencode(sentQueryParams)
+
+        if method in ['GET']:
+
+            #Options to add statements later on and for compatibility
+            pass
+
+        elif method in ['PATCH', 'POST', 'PUT', 'DELETE']:
+
+            if postData:
+                headers['Content-type'] = 'application/json'
+                data = self.sanitizeForSerialization(postData)
+                data = json.dumps(data)
+
+        else:
+            raise Exception('Method ' + method + ' is not recognized.')
+
+        if data:
+            data = data.encode('utf-8')
+
+        requestParams = MethodRequest(method=method, url=url,
+                                       headers=headers, data=data)
+
+        # Make the request
+        request = urllib.request.urlopen(requestParams)
+        encoding = request.headers.get_content_charset()
+        if not encoding:
+            encoding = 'iso-8859-1'
+        response = request.read().decode(encoding)
+
+        try:
+            data = json.loads(response)
+        except ValueError:  # PUT requests don't return anything
+            data = None
+
+        return data
+
+    def toPathValue(self, obj):
+        """Convert a string or object to a path-friendly value
+        Args:
+            obj -- object or string value
+        Returns:
+            string -- quoted value
+        """
+        if type(obj) == list:
+            return urllib.parse.quote(','.join(obj))
+        else:
+            return urllib.parse.quote(str(obj))
+
+    def sanitizeForSerialization(self, obj):
+        """Dump an object into JSON for POSTing."""
+
+        if type(obj) == type(None):
+            return None
+        elif type(obj) in [str, int, float, bool]:
+            return obj
+        elif type(obj) == list:
+            return [self.sanitizeForSerialization(subObj) for subObj in obj]
+        elif type(obj) == datetime.datetime:
+            return obj.isoformat()
+        else:
+            if type(obj) == dict:
+                objDict = obj
+            else:
+                objDict = obj.__dict__
+            return {key: self.sanitizeForSerialization(val)
+                    for (key, val) in objDict.items()
+                    if key != 'swaggerTypes'}
+
+    def _iso8601Format(self, timesep, microsecond, offset, zulu):
+        """Format for parsing a datetime string with given properties.
+
+        Args:
+            timesep -- string separating time from date ('T' or 't')
+            microsecond -- microsecond portion of time ('.XXX')
+            offset -- time offset (+/-XX:XX) or None
+            zulu -- 'Z' or 'z' for UTC, or None for time offset (+/-XX:XX)
+
+        Returns:
+            str - format string for datetime.strptime"""
+
+        return '%Y-%m-%d{}%H:%M:%S{}{}'.format(
+            timesep,
+            '.%f' if microsecond else '',
+            zulu or ('%z' if offset else ''))
+
+    # http://xml2rfc.ietf.org/public/rfc/html/rfc3339.html#anchor14
+    _iso8601Regex = re.compile(
+        r'^\d\d\d\d-\d\d-\d\d([Tt])\d\d:\d\d:\d\d(\.\d+)?(([Zz])|(\+|-)\d\d:?\d\d)?$')
+
+    def _parseDatetime(self, d):
+        if d is None:
+            return None
+        m = ApiClient._iso8601Regex.match(d)
+        if not m:
+            raise Exception('datetime regex match failed "%s"' % d)
+        timesep, microsecond, offset, zulu, plusminus = m.groups()
+        format = self._iso8601Format(timesep, microsecond, offset, zulu)
+        if offset and not zulu:
+            d = d.rsplit(sep=plusminus, maxsplit=1)[0] + offset.replace(':', '')
+        return datetime.datetime.strptime(d, format)
+
+    def deserialize(self, obj, objClass):
+        """Derialize a JSON string into an object.
+
+        Args:
+            obj -- string or object to be deserialized
+            objClass -- class literal for deserialzied object, or string
+                of class name
+        Returns:
+            object -- deserialized object"""
+
+        # Have to accept objClass as string or actual type. Type could be a
+        # native Python type, or one of the model classes.
+        if type(objClass) == str:
+            if 'list[' in objClass:
+                match = re.match('list\[(.*)\]', objClass)
+                subClass = match.group(1)
+                return [self.deserialize(subObj, subClass) for subObj in obj]
+
+            if (objClass in ['int', 'float', 'dict', 'list', 'str', 'bool', 'datetime']):
+                objClass = eval(objClass)
+            else:  # not a native type, must be model class
+                objClass = eval(objClass + '.' + objClass)
+
+        if objClass in [int, float, dict, list, str, bool]:
+            return objClass(obj)
+        elif objClass == datetime:
+            return self._parseDatetime(obj)
+
+        instance = objClass()
+
+        for attr, attrType in instance.swaggerTypes.items():
+
+            if attr in obj:
+                value = obj[attr]
+                if attrType in ['str', 'int', 'float', 'bool']:
+                    attrType = eval(attrType)
+                    try:
+                        value = attrType(value)
+                    except UnicodeEncodeError:
+                        value = unicode(value)
+                    except TypeError:
+                        value = value
+                    setattr(instance, attr, value)
+                elif (attrType == 'datetime'):
+                    setattr(instance, attr, self._parseDatetime(value))
+                elif 'list[' in attrType:
+                    match = re.match('list\[(.*)\]', attrType)
+                    subClass = match.group(1)
+                    subValues = []
+                    if not value:
+                        setattr(instance, attr, None)
+                    else:
+                        for subValue in value:
+                            subValues.append(self.deserialize(subValue,
+                                                              subClass))
+                    setattr(instance, attr, subValues)
+                else:
+                    setattr(instance, attr, self.deserialize(value,
+                                                             attrType))
+
+        return instance
+
+
+class MethodRequest(urllib.request.Request):
+
+    def __init__(self, *args, **kwargs):
+        """Construct a MethodRequest. Usage is the same as for
+        `urllib.Request` except it also takes an optional `method`
+        keyword argument. If supplied, `method` will be used instead of
+        the default."""
+
+        if 'method' in kwargs:
+            self.method = kwargs.pop('method')
+        return urllib.request.Request.__init__(self, *args, **kwargs)
+
+    def get_method(self):
+        return getattr(self, 'method', urllib.request.Request.get_method(self))
diff --git a/samples/client/petstore/python3/client/user_api.py b/samples/client/petstore/python3/client/user_api.py
new file mode 100644
index 00000000000..509cb927666
--- /dev/null
+++ b/samples/client/petstore/python3/client/user_api.py
@@ -0,0 +1,404 @@
+#!/usr/bin/env python
+"""
+UserApi.py
+Copyright 2015 Reverb Technologies, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually.
+"""
+import sys
+import os
+
+from .models import *
+
+
+class UserApi(object):
+
+    def __init__(self, apiClient):
+      self.apiClient = apiClient
+
+    
+    
+    def create_user(self, **kwargs):
+        """Create user
+        This can only be done by the logged in user.
+
+        Args:
+            body, User: Created user object (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['body']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method create_user" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/user'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'POST'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def create_users_with_array_input(self, **kwargs):
+        """Creates list of users with given input array
+        
+
+        Args:
+            body, list[User]: List of user object (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['body']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_array_input" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/user/createWithArray'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'POST'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def create_users_with_list_input(self, **kwargs):
+        """Creates list of users with given input array
+        
+
+        Args:
+            body, list[User]: List of user object (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['body']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method create_users_with_list_input" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/user/createWithList'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'POST'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def login_user(self, **kwargs):
+        """Logs user into the system
+        
+
+        Args:
+            username, str: The user name for login (required)
+            password, str: The password for login in clear text (required)
+            
+
+        Returns: str
+        """
+
+        allParams = ['username', 'password']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method login_user" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/user/login'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'GET'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+        if ('username' in params):
+            queryParams['username'] = self.apiClient.toPathValue(params['username'])
+        
+        if ('password' in params):
+            queryParams['password'] = self.apiClient.toPathValue(params['password'])
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        if not response:
+            return None
+
+        responseObject = self.apiClient.deserialize(response, 'str')
+        return responseObject
+        
+        
+        
+    
+    def logout_user(self, **kwargs):
+        """Logs out current logged in user session
+        
+
+        Args:
+            
+
+        Returns: 
+        """
+
+        allParams = []
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method logout_user" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/user/logout'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'GET'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def get_user_by_name(self, **kwargs):
+        """Get user by user name
+        
+
+        Args:
+            username, str: The name that needs to be fetched. Use user1 for testing.  (required)
+            
+
+        Returns: User
+        """
+
+        allParams = ['username']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method get_user_by_name" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/user/{username}'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'GET'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+        if ('username' in params):
+            replacement = str(self.apiClient.toPathValue(params['username']))
+            resourcePath = resourcePath.replace('{' + 'username' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        if not response:
+            return None
+
+        responseObject = self.apiClient.deserialize(response, 'User')
+        return responseObject
+        
+        
+        
+    
+    def update_user(self, **kwargs):
+        """Updated user
+        This can only be done by the logged in user.
+
+        Args:
+            username, str: name that need to be deleted (required)
+            body, User: Updated user object (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['username', 'body']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method update_user" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/user/{username}'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'PUT'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+        if ('username' in params):
+            replacement = str(self.apiClient.toPathValue(params['username']))
+            resourcePath = resourcePath.replace('{' + 'username' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+    def delete_user(self, **kwargs):
+        """Delete user
+        This can only be done by the logged in user.
+
+        Args:
+            username, str: The name that needs to be deleted (required)
+            
+
+        Returns: 
+        """
+
+        allParams = ['username']
+
+        params = locals()
+        for (key, val) in params['kwargs'].items():
+            if key not in allParams:
+                raise TypeError("Got an unexpected keyword argument '%s' to method delete_user" % key)
+            params[key] = val
+        del params['kwargs']
+
+        resourcePath = '/user/{username}'
+        resourcePath = resourcePath.replace('{format}', 'json')
+        method = 'DELETE'
+
+        queryParams = {}
+        headerParams = {}
+
+        
+
+        
+
+        
+        if ('username' in params):
+            replacement = str(self.apiClient.toPathValue(params['username']))
+            resourcePath = resourcePath.replace('{' + 'username' + '}',
+                                                replacement)
+        
+
+        postData = (params['body'] if 'body' in params else None)
+
+        response = self.apiClient.callAPI(resourcePath, method, queryParams,
+                                          postData, headerParams)
+
+        
+        
+        
+    
+
+
diff --git a/samples/client/petstore/ruby/Gemfile.lock b/samples/client/petstore/ruby/Gemfile.lock
index f90e3382ed2..232facf4677 100644
--- a/samples/client/petstore/ruby/Gemfile.lock
+++ b/samples/client/petstore/ruby/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swagger (4.06.08)
+    swagger-client (4.06.08)
       addressable (>= 2.2.4)
       json (>= 1.4.6)
       typhoeus (>= 0.2.1)
@@ -9,35 +9,43 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.7.0)
-    addressable (2.2.8)
+    ZenTest (4.11.0)
+    addressable (2.3.8)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    autotest-fsevent (0.2.8)
+    autotest-fsevent (0.2.10)
       sys-uname
     autotest-growl (0.2.16)
     autotest-rails-pure (4.1.2)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    json (1.7.0)
-    mime-types (1.18)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    sys-uname (0.9.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    ethon (0.7.3)
+      ffi (>= 1.3.0)
+    ffi (1.9.8)
+    json (1.8.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    safe_yaml (1.0.4)
+    sys-uname (0.9.2)
       ffi (>= 1.0.0)
-    typhoeus (0.3.3)
-      mime-types
-    vcr (2.1.1)
-    webmock (1.8.6)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+    typhoeus (0.7.1)
+      ethon (>= 0.7.1)
+    vcr (2.9.3)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -48,6 +56,6 @@ DEPENDENCIES
   autotest-growl
   autotest-rails-pure
   rspec (>= 2.5.0)
-  swagger!
+  swagger-client!
   vcr (>= 1.5.1)
   webmock (>= 1.6.2)
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
new file mode 100644
index 00000000000..29a7ce844ce
--- /dev/null
+++ b/samples/client/petstore/ruby/README.md
@@ -0,0 +1,57 @@
+## Installation
+
+### Build a gem
+
+You can build the generated client into a gem:
+
+```shell
+gem build swagger-client.gemspec
+```
+
+Then you can either install the gem:
+
+```shell
+gem install ./swagger-client-4.06.08.gem
+```
+
+or publish the gem to a gem server like [RubyGems](https://rubygems.org/).
+
+Finally add this to your Gemfile:
+
+    gem 'swagger-client', '~> 4.06.08'
+
+### Host as a git repository
+
+You can also choose to host the generated client as a git repository, e.g. on github:
+https://github.com/xhh/swagger-petstore-ruby
+
+Then you can reference it in Gemfile:
+
+    gem 'swagger-client', :git => 'https://github.com/xhh/swagger-petstore-ruby.git'
+
+### Use without installation
+
+You can also use the client directly like this:
+
+```shell
+ruby -Ilib script.rb
+```
+
+## Configuration
+
+```ruby
+require 'swagger-client'
+
+Swagger.configure do |config|
+  config.api_key = 'special-key'
+  config.host = 'petstore.swagger.io'
+  config.base_path = '/v2'
+end
+```
+
+## Getting Started
+
+```ruby
+pet = PetApi.getPetById(5)
+puts pet.to_body
+```
diff --git a/samples/client/petstore/ruby/lib/pet_api.rb b/samples/client/petstore/ruby/lib/pet_api.rb
index e8b9644453c..6b032510c41 100644
--- a/samples/client/petstore/ruby/lib/pet_api.rb
+++ b/samples/client/petstore/ruby/lib/pet_api.rb
@@ -4,388 +4,318 @@ class PetApi
   basePath = "http://petstore.swagger.io/v2"
   # apiInvoker = APIInvoker
 
-  def self.escapeString(string)
-    URI.encode(string.to_s)
-  end
+  # Update an existing pet
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Pet] :body Pet object that needs to be added to the store
+  # @return void
+  def self.update_pet(opts = {})
+    # verify existence of params
 
-  
-  def self.updatePet (body, opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'body' => body
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/pet".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = ['application/json', 'application/xml', ]
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
-    if body != nil
-      if body.is_a?(Array)
-        array = Array.new
-        body.each do |item|
-          if item.respond_to?("to_body".to_sym)
-            array.push item.to_body
+    _body_param = opts[:'body']
+    if _body_param != nil
+      if _body_param.is_a?(Array)
+        _array = Array.new
+        _body_param.each do |item|
+          if item.respond_to?(:to_body)
+            _array.push item.to_body
           else
-            array.push item
+            _array.push item
           end
         end
-        post_body = array
-
+        post_body = _array
       else 
-        if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+        if _body_param.respond_to?(:to_body)
+          post_body = _body_param.to_body
+        else
+          post_body = _body_param
+        end
       end
     end
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:PUT, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:PUT, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
 
+  # Add a new pet to the store
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Pet] :body Pet object that needs to be added to the store
+  # @return void
+  def self.add_pet(opts = {})
+    # verify existence of params
 
-  def self.addPet (body, opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'body' => body
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/pet".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = ['application/json', 'application/xml', ]
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
-    if body != nil
-      if body.is_a?(Array)
-        array = Array.new
-        body.each do |item|
-          if item.respond_to?("to_body".to_sym)
-            array.push item.to_body
+    _body_param = opts[:'body']
+    if _body_param != nil
+      if _body_param.is_a?(Array)
+        _array = Array.new
+        _body_param.each do |item|
+          if item.respond_to?(:to_body)
+            _array.push item.to_body
           else
-            array.push item
+            _array.push item
           end
         end
-        post_body = array
-
+        post_body = _array
       else 
-        if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+        if _body_param.respond_to?(:to_body)
+          post_body = _body_param.to_body
+        else
+          post_body = _body_param
+        end
       end
     end
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
 
+  # Finds Pets by status
+  # Multiple status values can be provided with comma seperated strings
+  # @param [Hash] opts the optional parameters
+  # @option opts [array[string]] :status Status values that need to be considered for filter
+  # @return array[Pet]
+  def self.find_pets_by_status(opts = {})
+    # verify existence of params
 
-  def self.findPetsByStatus (status, opts={})
-    query_param_keys = [:status]
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'status' => status
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/pet/findByStatus".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
+    query_params[:'status'] = opts[:'status'] if opts[:'status']
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-    
+    response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
     response.map {|response| Pet.new(response) }
-    
-    
-  
   end
 
+  # Finds Pets by tags
+  # Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+  # @param [Hash] opts the optional parameters
+  # @option opts [array[string]] :tags Tags to filter by
+  # @return array[Pet]
+  def self.find_pets_by_tags(opts = {})
+    # verify existence of params
 
-  def self.findPetsByTags (tags, opts={})
-    query_param_keys = [:tags]
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'tags' => tags
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/pet/findByTags".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
+    query_params[:'tags'] = opts[:'tags'] if opts[:'tags']
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-    
+    response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
     response.map {|response| Pet.new(response) }
-    
-    
-  
   end
 
+  # Find pet by ID
+  # Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+  # @param pet_id ID of pet that needs to be fetched
+  # @param [Hash] opts the optional parameters
+  # @return Pet
+  def self.get_pet_by_id(pet_id, opts = {})
+    # verify existence of params
+    raise "pet_id is required" if pet_id.nil?
 
-  def self.getPetById (pet_id, opts={})
-    query_param_keys = []
+    # resource path
+    path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
 
-    
-    
-    # set default values and merge with input
-    options = {
-      :'pet_id' => pet_id
-      
-    }.merge(opts)
+    # query parameters
+    query_params = {}
 
-    #resource path
-    path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', escapeString(pet_id))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
+    # header parameters
+    header_params = {}
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-     Pet.new(response)
-    
-    
-  
+    response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
+    Pet.new(response)
   end
 
+  # Updates a pet in the store with form data
+  # 
+  # @param pet_id ID of pet that needs to be updated
+  # @param [Hash] opts the optional parameters
+  # @option opts [string] :name Updated name of the pet
+  # @option opts [string] :status Updated status of the pet
+  # @return void
+  def self.update_pet_with_form(pet_id, opts = {})
+    # verify existence of params
+    raise "pet_id is required" if pet_id.nil?
 
-  def self.updatePetWithForm (pet_id,name,status, opts={})
-    query_param_keys = []
+    # resource path
+    path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
 
-    
-    
-    # set default values and merge with input
-    options = {
-      :'pet_id' => pet_id,
-      :'name' => name,
-      :'status' => status
-      
-    }.merge(opts)
+    # query parameters
+    query_params = {}
 
-    #resource path
-    path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', escapeString(pet_id))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
+    # header parameters
+    header_params = {}
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = ['application/x-www-form-urlencoded', ]
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
+    form_params["name"] = opts[:'name'] if opts[:'name']
+    form_params["status"] = opts[:'status'] if opts[:'status']
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-    form_parameter_hash["name"] = name
-    form_parameter_hash["status"] = status
-
-    
-    
-    Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
 
+  # Deletes a pet
+  # 
+  # @param pet_id Pet id to delete
+  # @param [Hash] opts the optional parameters
+  # @option opts [string] :api_key 
+  # @return void
+  def self.delete_pet(pet_id, opts = {})
+    # verify existence of params
+    raise "pet_id is required" if pet_id.nil?
 
-  def self.deletePet (api_key,pet_id, opts={})
-    query_param_keys = []
+    # resource path
+    path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
 
-    
-    
-    # set default values and merge with input
-    options = {
-      :'api_key' => api_key,
-      :'pet_id' => pet_id
-      
-    }.merge(opts)
+    # query parameters
+    query_params = {}
 
-    #resource path
-    path = "/pet/{petId}".sub('{format}','json').sub('{' + 'petId' + '}', escapeString(pet_id))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
+    # header parameters
+    header_params = {}
 
-    # header parameters, if any
-    headers = {}
-    
-    headers[:'api_key'] = api_key
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+    header_params[:'api_key'] = opts[:'api_key'] if opts[:'api_key']
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
 
+  # uploads an image
+  # 
+  # @param pet_id ID of pet to update
+  # @param [Hash] opts the optional parameters
+  # @option opts [string] :additional_metadata Additional data to pass to server
+  # @option opts [file] :file file to upload
+  # @return void
+  def self.upload_file(pet_id, opts = {})
+    # verify existence of params
+    raise "pet_id is required" if pet_id.nil?
 
-  def self.uploadFile (pet_id,additional_metadata,file, opts={})
-    query_param_keys = []
+    # resource path
+    path = "/pet/{petId}/uploadImage".sub('{format}','json').sub('{' + 'petId' + '}', pet_id.to_s)
 
-    
-    
-    # set default values and merge with input
-    options = {
-      :'pet_id' => pet_id,
-      :'additional_metadata' => additional_metadata,
-      :'file' => file
-      
-    }.merge(opts)
+    # query parameters
+    query_params = {}
 
-    #resource path
-    path = "/pet/{petId}/uploadImage".sub('{format}','json').sub('{' + 'petId' + '}', escapeString(pet_id))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
+    # header parameters
+    header_params = {}
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = ['multipart/form-data', ]
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
+    form_params["additionalMetadata"] = opts[:'additional_metadata'] if opts[:'additional_metadata']
+    form_params["file"] = opts[:'file'] if opts[:'file']
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-    form_parameter_hash["additionalMetadata"] = additional_metadata
-    form_parameter_hash["file"] = file
-
-    
-    
-    Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
-
 end
diff --git a/samples/client/petstore/ruby/lib/store_api.rb b/samples/client/petstore/ruby/lib/store_api.rb
index 4c553185ef3..6cd3296039b 100644
--- a/samples/client/petstore/ruby/lib/store_api.rb
+++ b/samples/client/petstore/ruby/lib/store_api.rb
@@ -4,194 +4,155 @@ class StoreApi
   basePath = "http://petstore.swagger.io/v2"
   # apiInvoker = APIInvoker
 
-  def self.escapeString(string)
-    URI.encode(string.to_s)
-  end
+  # Returns pet inventories by status
+  # Returns a map of status codes to quantities
+  # @param [Hash] opts the optional parameters
+  # @return map[string,int]
+  def self.get_inventory(opts = {})
+    # verify existence of params
 
-  
-  def self.getInventory ( opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/store/inventory".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
 
-    # http body (model)
-    post_body = nil
-    
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
 
     # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-    
-    response.map {|response| map.new(response) }
-    
-    
-  
-  end
-
-
-  def self.placeOrder (body, opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'body' => body
-      
-    }.merge(opts)
-
-    #resource path
-    path = "/store/order".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
-
-    # header parameters, if any
-    headers = {}
-    
-    
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
-    if body != nil
-      if body.is_a?(Array)
-        array = Array.new
-        body.each do |item|
-          if item.respond_to?("to_body".to_sym)
-            array.push item.to_body
+
+    response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
+    response.map {|response| map.new(response) }
+  end
+
+  # Place an order for a pet
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Order] :body order placed for purchasing the pet
+  # @return Order
+  def self.place_order(opts = {})
+    # verify existence of params
+
+    # resource path
+    path = "/store/order".sub('{format}','json')
+
+    # query parameters
+    query_params = {}
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
+
+    # http body (model)
+    post_body = nil
+    _body_param = opts[:'body']
+    if _body_param != nil
+      if _body_param.is_a?(Array)
+        _array = Array.new
+        _body_param.each do |item|
+          if item.respond_to?(:to_body)
+            _array.push item.to_body
           else
-            array.push item
+            _array.push item
           end
         end
-        post_body = array
-
+        post_body = _array
       else 
-        if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+        if _body_param.respond_to?(:to_body)
+          post_body = _body_param.to_body
+        else
+          post_body = _body_param
+        end
       end
     end
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-     Order.new(response)
-    
-    
-  
+    response = Swagger::Request.new(:POST, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
+    Order.new(response)
   end
 
+  # Find purchase order by ID
+  # For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+  # @param order_id ID of pet that needs to be fetched
+  # @param [Hash] opts the optional parameters
+  # @return Order
+  def self.get_order_by_id(order_id, opts = {})
+    # verify existence of params
+    raise "order_id is required" if order_id.nil?
 
-  def self.getOrderById (order_id, opts={})
-    query_param_keys = []
+    # resource path
+    path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s)
 
-    
-    
-    # set default values and merge with input
-    options = {
-      :'order_id' => order_id
-      
-    }.merge(opts)
+    # query parameters
+    query_params = {}
 
-    #resource path
-    path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', escapeString(order_id))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
+    # header parameters
+    header_params = {}
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-     Order.new(response)
-    
-    
-  
+    response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
+    Order.new(response)
   end
 
+  # Delete purchase order by ID
+  # For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+  # @param order_id ID of the order that needs to be deleted
+  # @param [Hash] opts the optional parameters
+  # @return void
+  def self.delete_order(order_id, opts = {})
+    # verify existence of params
+    raise "order_id is required" if order_id.nil?
 
-  def self.deleteOrder (order_id, opts={})
-    query_param_keys = []
+    # resource path
+    path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', order_id.to_s)
 
-    
-    
-    # set default values and merge with input
-    options = {
-      :'order_id' => order_id
-      
-    }.merge(opts)
+    # query parameters
+    query_params = {}
 
-    #resource path
-    path = "/store/order/{orderId}".sub('{format}','json').sub('{' + 'orderId' + '}', escapeString(order_id))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
+    # header parameters
+    header_params = {}
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
-
 end
diff --git a/samples/client/petstore/ruby/lib/swagger-client.rb b/samples/client/petstore/ruby/lib/swagger-client.rb
new file mode 100644
index 00000000000..b13f83b1dbc
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/swagger-client.rb
@@ -0,0 +1,5 @@
+require 'monkey'
+require 'swagger'
+
+Dir[File.join(File.dirname(__FILE__), "../lib/*.rb")].each {|file| require file if file !~ /swagger-client\.rb\z/ }
+Dir[File.join(File.dirname(__FILE__), "../models/*.rb")].each {|file| require file }
diff --git a/samples/client/petstore/ruby/lib/swagger.rb b/samples/client/petstore/ruby/lib/swagger.rb
index 1cc3ea456c2..fff098e96fc 100644
--- a/samples/client/petstore/ruby/lib/swagger.rb
+++ b/samples/client/petstore/ruby/lib/swagger.rb
@@ -7,6 +7,8 @@ require 'logger'
 
 module Swagger
     
+  @configuration = Configuration.new
+
   class << self
     attr_accessor :logger
     
@@ -27,7 +29,6 @@ module Swagger
     #   end
     #
     def configure
-      self.configuration ||= Configuration.new
       yield(configuration) if block_given?
 
       # Configure logger.  Default to use Rails
diff --git a/samples/client/petstore/ruby/lib/swagger/configuration.rb b/samples/client/petstore/ruby/lib/swagger/configuration.rb
index 1cf6e0dfa0e..2a3728483f5 100644
--- a/samples/client/petstore/ruby/lib/swagger/configuration.rb
+++ b/samples/client/petstore/ruby/lib/swagger/configuration.rb
@@ -9,10 +9,10 @@ module Swagger
     def initialize
       @format = 'json'
       @scheme = 'http'
-      @host = 'api.wordnik.com'
-      @base_path = '/v4'
+      @host = 'petstore.swagger.io'
+      @base_path = '/v2'
       @user_agent = "ruby-swagger-#{Swagger::VERSION}"
-      @inject_format = true
+      @inject_format = false
       @force_ending_format = false
       @camelize_params = true
     end
diff --git a/samples/client/petstore/ruby/lib/swagger/request.rb b/samples/client/petstore/ruby/lib/swagger/request.rb
index 34401827982..fbd70eeb9f5 100644
--- a/samples/client/petstore/ruby/lib/swagger/request.rb
+++ b/samples/client/petstore/ruby/lib/swagger/request.rb
@@ -74,11 +74,6 @@ module Swagger
     def interpreted_path
       p = self.path.dup
 
-      # Fill in the path params
-      self.params.each_pair do |key, value|
-        p = p.gsub("{#{key}}", value.to_s)
-      end
-
       # Stick a .{format} placeholder into the path if there isn't
       # one already or an actual format like json or xml
       # e.g. /words/blah => /words.{format}/blah
@@ -157,8 +152,9 @@ module Swagger
     end
   
     def make
-      logger = Logger.new STDOUT
-      logger.debug self.url
+      #TODO use configuration setting to determine if debugging
+      #logger = Logger.new STDOUT
+      #logger.debug self.url
       response = case self.http_method.to_sym
       when :get,:GET
         Typhoeus::Request.get(
diff --git a/samples/client/petstore/ruby/lib/user_api.rb b/samples/client/petstore/ruby/lib/user_api.rb
index 6738cddb5f9..dead94897cd 100644
--- a/samples/client/petstore/ruby/lib/user_api.rb
+++ b/samples/client/petstore/ruby/lib/user_api.rb
@@ -4,418 +4,347 @@ class UserApi
   basePath = "http://petstore.swagger.io/v2"
   # apiInvoker = APIInvoker
 
-  def self.escapeString(string)
-    URI.encode(string.to_s)
-  end
+  # Create user
+  # This can only be done by the logged in user.
+  # @param [Hash] opts the optional parameters
+  # @option opts [User] :body Created user object
+  # @return void
+  def self.create_user(opts = {})
+    # verify existence of params
 
-  
-  def self.createUser (body, opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'body' => body
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/user".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
-    if body != nil
-      if body.is_a?(Array)
-        array = Array.new
-        body.each do |item|
-          if item.respond_to?("to_body".to_sym)
-            array.push item.to_body
+    _body_param = opts[:'body']
+    if _body_param != nil
+      if _body_param.is_a?(Array)
+        _array = Array.new
+        _body_param.each do |item|
+          if item.respond_to?(:to_body)
+            _array.push item.to_body
           else
-            array.push item
+            _array.push item
           end
         end
-        post_body = array
-
+        post_body = _array
       else 
-        if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+        if _body_param.respond_to?(:to_body)
+          post_body = _body_param.to_body
+        else
+          post_body = _body_param
+        end
       end
     end
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
 
+  # Creates list of users with given input array
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [array[User]] :body List of user object
+  # @return void
+  def self.create_users_with_array_input(opts = {})
+    # verify existence of params
 
-  def self.createUsersWithArrayInput (body, opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'body' => body
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/user/createWithArray".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
-    if body != nil
-      if body.is_a?(Array)
-        array = Array.new
-        body.each do |item|
-          if item.respond_to?("to_body".to_sym)
-            array.push item.to_body
+    _body_param = opts[:'body']
+    if _body_param != nil
+      if _body_param.is_a?(Array)
+        _array = Array.new
+        _body_param.each do |item|
+          if item.respond_to?(:to_body)
+            _array.push item.to_body
           else
-            array.push item
+            _array.push item
           end
         end
-        post_body = array
-
+        post_body = _array
       else 
-        if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+        if _body_param.respond_to?(:to_body)
+          post_body = _body_param.to_body
+        else
+          post_body = _body_param
+        end
       end
     end
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
 
+  # Creates list of users with given input array
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [array[User]] :body List of user object
+  # @return void
+  def self.create_users_with_list_input(opts = {})
+    # verify existence of params
 
-  def self.createUsersWithListInput (body, opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'body' => body
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/user/createWithList".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
-    if body != nil
-      if body.is_a?(Array)
-        array = Array.new
-        body.each do |item|
-          if item.respond_to?("to_body".to_sym)
-            array.push item.to_body
+    _body_param = opts[:'body']
+    if _body_param != nil
+      if _body_param.is_a?(Array)
+        _array = Array.new
+        _body_param.each do |item|
+          if item.respond_to?(:to_body)
+            _array.push item.to_body
           else
-            array.push item
+            _array.push item
           end
         end
-        post_body = array
-
+        post_body = _array
       else 
-        if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+        if _body_param.respond_to?(:to_body)
+          post_body = _body_param.to_body
+        else
+          post_body = _body_param
+        end
       end
     end
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:POST, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
 
+  # Logs user into the system
+  # 
+  # @param [Hash] opts the optional parameters
+  # @option opts [string] :username The user name for login
+  # @option opts [string] :password The password for login in clear text
+  # @return string
+  def self.login_user(opts = {})
+    # verify existence of params
 
-  def self.loginUser (username,password, opts={})
-    query_param_keys = [:username,:password]
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'username' => username,
-      :'password' => password
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/user/login".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
+    query_params[:'username'] = opts[:'username'] if opts[:'username']
+    query_params[:'password'] = opts[:'password'] if opts[:'password']
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-     string.new(response)
-    
-    
-  
+    response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
+    string.new(response)
   end
 
+  # Logs out current logged in user session
+  # 
+  # @param [Hash] opts the optional parameters
+  # @return void
+  def self.logout_user(opts = {})
+    # verify existence of params
 
-  def self.logoutUser ( opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      
-    }.merge(opts)
-
-    #resource path
+    # resource path
     path = "/user/logout".sub('{format}','json')
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    # query parameters
+    query_params = {}
 
-    # http body (model)
-    post_body = nil
-    
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
 
     # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
-  end
-
-
-  def self.getUserByName (username, opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'username' => username
-      
-    }.merge(opts)
-
-    #resource path
-    path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', escapeString(username))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
-
-    # header parameters, if any
-    headers = {}
-    
-    
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
+
+    Swagger::Request.new(:GET, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
+  end
+
+  # Get user by user name
+  # 
+  # @param username The name that needs to be fetched. Use user1 for testing. 
+  # @param [Hash] opts the optional parameters
+  # @return User
+  def self.get_user_by_name(username, opts = {})
+    # verify existence of params
+    raise "username is required" if username.nil?
+
+    # resource path
+    path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
+
+    # query parameters
+    query_params = {}
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
 
     # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make.body
-     User.new(response)
-    
-    
-  
-  end
-
-
-  def self.updateUser (username,body, opts={})
-    query_param_keys = []
-
-    
-    
-    # set default values and merge with input
-    options = {
-      :'username' => username,
-      :'body' => body
-      
-    }.merge(opts)
-
-    #resource path
-    path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', escapeString(username))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
-
-    # header parameters, if any
-    headers = {}
-    
-    
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
-    if body != nil
-      if body.is_a?(Array)
-        array = Array.new
-        body.each do |item|
-          if item.respond_to?("to_body".to_sym)
-            array.push item.to_body
+
+    response = Swagger::Request.new(:GET, path, {:params => query_params, :headers => header_params, :form_params => form_params, :body => post_body}).make.body
+    User.new(response)
+  end
+
+  # Updated user
+  # This can only be done by the logged in user.
+  # @param username name that need to be deleted
+  # @param [Hash] opts the optional parameters
+  # @option opts [User] :body Updated user object
+  # @return void
+  def self.update_user(username, opts = {})
+    # verify existence of params
+    raise "username is required" if username.nil?
+
+    # resource path
+    path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
+
+    # query parameters
+    query_params = {}
+
+    # header parameters
+    header_params = {}
+
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
+
+    # http body (model)
+    post_body = nil
+    _body_param = opts[:'body']
+    if _body_param != nil
+      if _body_param.is_a?(Array)
+        _array = Array.new
+        _body_param.each do |item|
+          if item.respond_to?(:to_body)
+            _array.push item.to_body
           else
-            array.push item
+            _array.push item
           end
         end
-        post_body = array
-
+        post_body = _array
       else 
-        if body.respond_to?("to_body".to_sym)
-	        post_body = body.to_body
-	      else
-	        post_body = body
-	      end
+        if _body_param.respond_to?(:to_body)
+          post_body = _body_param.to_body
+        else
+          post_body = _body_param
+        end
       end
     end
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:PUT, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:PUT, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
 
+  # Delete user
+  # This can only be done by the logged in user.
+  # @param username The name that needs to be deleted
+  # @param [Hash] opts the optional parameters
+  # @return void
+  def self.delete_user(username, opts = {})
+    # verify existence of params
+    raise "username is required" if username.nil?
 
-  def self.deleteUser (username, opts={})
-    query_param_keys = []
+    # resource path
+    path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', username.to_s)
 
-    
-    
-    # set default values and merge with input
-    options = {
-      :'username' => username
-      
-    }.merge(opts)
+    # query parameters
+    query_params = {}
 
-    #resource path
-    path = "/user/{username}".sub('{format}','json').sub('{' + 'username' + '}', escapeString(username))
-    
-    
-    # pull querystring keys from options
-    queryopts = options.select do |key,value|
-      query_param_keys.include? key
-    end
+    # header parameters
+    header_params = {}
 
-    # header parameters, if any
-    headers = {}
-    
-    
+    _header_accept = 'application/json, application/xml'
+    header_params['Accept'] = _header_accept if _header_accept != ''
+
+    _header_content_type = []
+    header_params['Content-Type'] = _header_content_type.length > 0 ? _header_content_type[0] : 'application/json'
+
+    # form parameters
+    form_params = {}
 
     # http body (model)
     post_body = nil
-    
 
-    # form parameters
-    form_parameter_hash = {}
-    
-
-    
-    
-    Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body, :form_params => form_parameter_hash }).make
-    
-  
+    Swagger::Request.new(:DELETE, path, {:params => query_params,:headers => header_params, :form_params => form_params, :body => post_body}).make
   end
-
 end
diff --git a/samples/client/petstore/ruby/pom.xml b/samples/client/petstore/ruby/pom.xml
new file mode 100644
index 00000000000..1d613f0a9c5
--- /dev/null
+++ b/samples/client/petstore/ruby/pom.xml
@@ -0,0 +1,60 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.wordnik</groupId>
+  <artifactId>RubyPetstoreClientTests</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>Ruby Swagger Petstore Client</name>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>bundle-install</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>bundle</executable>
+              <arguments>
+                <argument>install</argument>
+              </arguments>
+            </configuration>
+          </execution>
+          <execution>
+            <id>bundle-test</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>bundle</executable>
+              <arguments>
+                <argument>exec</argument>
+                <argument>rspec</argument>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/samples/client/petstore/ruby/spec/pet_spec.rb b/samples/client/petstore/ruby/spec/pet_spec.rb
index eaa9ebb05fe..67cee70c1ee 100644
--- a/samples/client/petstore/ruby/spec/pet_spec.rb
+++ b/samples/client/petstore/ruby/spec/pet_spec.rb
@@ -2,69 +2,53 @@ require 'spec_helper'
 
 describe "Pet" do
   before do
-	  Swagger.configure do |config|
-	    config.api_key = 'special-key' 
-	    config.host = 'petstore.swagger.wordnik.com'
-	    config.base_path = '/api'
-	  end
+    configure_swagger
+    prepare_pet
   end
   
   describe "pet methods" do
     it "should fetch a pet object" do
-      pet = Pet_api.get_pet_by_id(1)
-      pet.id.should == 1
-      pet.name.should == "Cat 1"
+      pet = PetApi.get_pet_by_id(10002)
+      pet.should be_a(Pet)
+      pet.id.should == 10002
+      pet.name.should == "RUBY UNIT TESTING"
     end
 
     it "should find pets by status" do
-      pets = Pet_api.find_pets_by_status('available')
+      pets = PetApi.find_pets_by_status(:status => 'available')
       pets.length.should >= 3
     end
     
     it "should not find a pet with invalid status" do
-      pets = Pet_api.find_pets_by_status('dead')
+      pets = PetApi.find_pets_by_status(:status => 'invalid-status')
       pets.length.should == 0
     end
 
-	  it "should find a pet by status" do
-	    pets = Pet_api.find_pets_by_status("available,sold")
-	    pets.map {|pet| 
-	      if(pet.status != 'available' && pet.status != 'sold') 
-	        raise "pet status wasn't right"
-	      end
-	    }
-	  end
-	  
-	  it "should update a pet" do
-	    pet = Pet.new({:id => 99, :name => 'programmer', :status => 'coding'})
-	    Pet_api.add_pet(pet)
-	    
-	    fetched = Pet_api.get_pet_by_id(99)
-	    fetched.id.should == 99
-	  end
+    it "should find a pet by status" do
+      pets = PetApi.find_pets_by_status(:status => "available,sold")
+      pets.map {|pet| 
+        if(pet.status != 'available' && pet.status != 'sold') 
+          raise "pet status wasn't right"
+        end
+      }
+    end
+    
+    it "should update a pet" do
+      pet = Pet.new({'id' => 10002, 'status' => 'sold'})
+      PetApi.add_pet(:body => pet)
+      
+      fetched = PetApi.get_pet_by_id(10002)
+      fetched.id.should == 10002
+      fetched.status.should == 'sold'
+    end
 
     it "should create a pet" do 
-      pet = Pet.new({:id => 100, :name => "Gorilla"})
-      raise pet.inspect
-      Pet_api.add_pet(pet)
+      pet = Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING")
+      PetApi.add_pet(:body => pet)
 
-      pet = Pet_api.get_pet_by_id(100)
-      pet.id.should == 100
+      pet = PetApi.get_pet_by_id(10002)
+      pet.id.should == 10002
+      pet.name.should == "RUBY UNIT TESTING"
     end
   end
 end
-
-describe "Store" do
-  before do
-	  Swagger.configure do |config|
-	    config.api_key = 'special-key' 
-	    config.host = 'petstore.swagger.wordnik.com'
-	    config.base_path = '/api'
-	  end
-  end
-
-  it "should fetch an order" do
-    item = Store_api.get_order_by_id(1)
-    item.id.should == 1
-  end
-end
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/spec/request_spec.rb b/samples/client/petstore/ruby/spec/request_spec.rb
index e2afd126873..61389eddc9c 100644
--- a/samples/client/petstore/ruby/spec/request_spec.rb
+++ b/samples/client/petstore/ruby/spec/request_spec.rb
@@ -2,9 +2,16 @@ require 'spec_helper'
 
 describe Swagger::Request do
 
-  before(:each) do
+  before(:each) do 
+    Swagger.configure do |config|
+      inject_format = true
+      config.api_key = 'special-key'
+      config.host = 'petstore.swagger.io'
+      config.base_path = '/v2'
+    end
+
     @default_http_method = :get
-    @default_path = "pet/fancy"
+    @default_path = "pet.{format}/fancy"
     @default_params = {
       :params => {:foo => "1", :bar => "2"}
     }
@@ -44,7 +51,7 @@ describe Swagger::Request do
     end
 
     it "constructs a full url" do
-      @request.url.should == "http://petstore.swagger.wordnik.com/api/pet.json/fancy?bar=2&foo=1"
+      @request.url.should == "http://petstore.swagger.io/v2/pet.json/fancy?bar=2&foo=1"
     end
 
   end
@@ -66,23 +73,21 @@ describe Swagger::Request do
   describe "path" do
 
     it "accounts for a total absence of format in the path string" do
-      @request = Swagger::Request.new(:get, "/word/{word}/entries", @default_params.merge({
+      @request = Swagger::Request.new(:get, "/word.{format}/cat/entries", @default_params.merge({
         :format => "xml",
         :params => {
-          :word => "cat"
         }
       }))
-      @request.url.should == "http://petstore.swagger.wordnik.com/api/word.xml/cat/entries"
+      @request.url.should == "http://petstore.swagger.io/v2/word.xml/cat/entries"
     end
 
-    it "does string substitution on path params" do
-      @request = Swagger::Request.new(:get, "/word.{format}/{word}/entries", @default_params.merge({
+    it "does string substitution (format) on path params" do
+      @request = Swagger::Request.new(:get, "/word.{format}/cat/entries", @default_params.merge({
         :format => "xml",
         :params => {
-          :word => "cat"
         }
       }))
-      @request.url.should == "http://petstore.swagger.wordnik.com/api/word.xml/cat/entries"
+      @request.url.should == "http://petstore.swagger.io/v2/word.xml/cat/entries"
     end
 
     it "leaves path-bound params out of the query string" do
@@ -116,7 +121,7 @@ describe Swagger::Request do
     end
 
     it "URI encodes the path" do
-      @request = Swagger::Request.new(:get, "word.{format}/{word}/definitions", @default_params.merge({
+      @request = Swagger::Request.new(:get, "word.{format}/bill gates/definitions", @default_params.merge({
         :params => {
           :word => "bill gates"
         }
@@ -193,4 +198,4 @@ describe Swagger::Request do
 
   end
 
-end
\ No newline at end of file
+end
diff --git a/samples/client/petstore/ruby/spec/response_spec.rb b/samples/client/petstore/ruby/spec/response_spec.rb
index 1092ee9d198..c0542005cb0 100644
--- a/samples/client/petstore/ruby/spec/response_spec.rb
+++ b/samples/client/petstore/ruby/spec/response_spec.rb
@@ -2,10 +2,15 @@ require 'spec_helper'
 
 describe Swagger::Response do
 
+  before do
+    configure_swagger
+    prepare_pet
+  end
+
   before(:each) do
 
     VCR.use_cassette('pet_resource', :record => :new_episodes) do
-      @raw = Typhoeus::Request.get("http://petstore.swagger.wordnik.com/api/pet.json")
+      @raw = Typhoeus::Request.get("http://petstore.swagger.io/v2/pet/10002")
     end
 
     @response = Swagger::Response.new(@raw)
@@ -14,7 +19,7 @@ describe Swagger::Response do
   describe "initialization" do
     it "sets body" do
       @response.body.class.should == Hash
-      @response.body.has_key?('apis').should == true
+      @response.body.has_key?('name').should == true
     end
 
     it "sets code" do
@@ -35,7 +40,8 @@ describe Swagger::Response do
 
     it "recognizes xml" do
       VCR.use_cassette('xml_response_request', :record => :new_episodes) do
-        @raw = Typhoeus::Request.get("http://petstore.swagger.wordnik.com/api/pet.xml")
+        @raw = Typhoeus::Request.get("http://petstore.swagger.io/v2/pet/10002",
+                                    :headers => {'Accept'=> "application/xml"})
       end
       @response = Swagger::Response.new(@raw)
       @response.format.should == 'xml'
@@ -56,4 +62,4 @@ describe Swagger::Response do
 
   end
 
-end
\ No newline at end of file
+end
diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb
index 926f8e2abd6..71725a45a6c 100644
--- a/samples/client/petstore/ruby/spec/spec_helper.rb
+++ b/samples/client/petstore/ruby/spec/spec_helper.rb
@@ -1,21 +1,23 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'monkey'
-require 'swagger'
+require 'swagger-client'
 require 'vcr'
 require 'typhoeus'
 require 'json'
 require 'yaml'
 require 'rspec'
 
-Dir[File.join(File.dirname(__FILE__), "../lib/*.rb")].each {|file| require file }
-Dir[File.join(File.dirname(__FILE__), "../models/*.rb")].each {|file| require file }
-Dir[File.join(File.dirname(__FILE__), "../resources/*.rb")].each {|file| require file }
-
 RSpec.configure do |config|
   # some (optional) config here
+  config.expect_with :rspec do |c|
+    c.syntax = :should
+  end
+  config.mock_with :rspec do |c|
+    c.syntax = :should
+  end
 end
 
+
 WebMock.allow_net_connect! if defined? WebMock
 
 def help
@@ -26,24 +28,42 @@ def help
   exit
 end
 
+# no longer reading credentials (not used) from file (20150413)
 # Parse ~/.swagger.yml for user credentials
-begin
-  CREDENTIALS = YAML::load_file(File.join(ENV['HOME'], ".swagger.yml")).symbolize_keys
-rescue
-  help
-end
+#begin
+#  CREDENTIALS = YAML::load_file(File.join(ENV['HOME'], ".swagger.yml")).symbolize_keys
+#rescue
+#  help
+#end
 
 def configure_swagger
   Swagger.configure do |config|
-    config.api_key = "special-key"
-    config.username = ""
-    config.password = ""
-
-    config.host = 'petstore.swagger.wordnik.com'
-    config.base_path = '/api'
+    config.api_key = 'special-key'
+    config.host = 'petstore.swagger.io'
+    config.base_path = '/v2'
   end
 end
 
+# always delete and then re-create the pet object with 10002
+def prepare_pet
+  # remove the pet
+  PetApi.delete_pet(10002)
+  # recreate the pet
+  pet = Pet.new('id' => 10002, 'name' => "RUBY UNIT TESTING")
+  PetApi.add_pet(:body => pet)
+end
+
+# always delete and then re-create the store order 
+def prepare_store
+  order = Order.new("id" => 10002,
+		  "petId" => 10002,
+		  "quantity" => 789,
+		  "shipDate" => "2015-04-06T23:42:01.678Z",
+		  "status" => "placed",
+		  "complete" => false)
+  StoreApi.place_order(:body => order)
+end
+
 configure_swagger
 
 # A random string to tack onto stuff to ensure we're not seeing 
diff --git a/samples/client/petstore/ruby/spec/store_spec.rb b/samples/client/petstore/ruby/spec/store_spec.rb
new file mode 100644
index 00000000000..a1e2bd3193f
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/store_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "Store" do
+  before do
+    configure_swagger
+    prepare_store
+  end
+
+  it "should fetch an order" do
+    item = StoreApi.get_order_by_id(10002)
+    item.id.should == 10002
+  end
+end
diff --git a/samples/client/petstore/ruby/swagger-client.gemspec b/samples/client/petstore/ruby/swagger-client.gemspec
new file mode 100644
index 00000000000..bbff5f95f6b
--- /dev/null
+++ b/samples/client/petstore/ruby/swagger-client.gemspec
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "swagger/version"
+
+Gem::Specification.new do |s|
+  s.name        = "swagger-client"
+  s.version     = Swagger::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Zeke Sikelianos", "Tony Tam"]
+  s.email       = ["zeke@wordnik.com", "tony@wordnik.com"]
+  s.homepage    = "http://developer.wordnik.com"
+  s.summary     = %q{A ruby wrapper for the swagger APIs}
+  s.description = %q{This gem maps to a swagger API}
+
+  s.rubyforge_project = "swagger-client"
+
+  s.add_dependency 'typhoeus', '>=0.2.1'
+  s.add_dependency 'addressable', '>=2.2.4'
+  s.add_dependency 'json', '>=1.4.6'
+
+  s.add_development_dependency 'rspec', '>=2.5.0'
+  s.add_development_dependency 'vcr', '>=1.5.1'
+  s.add_development_dependency 'webmock', '>=1.6.2'
+  s.add_development_dependency 'autotest'
+  s.add_development_dependency 'autotest-rails-pure'
+  s.add_development_dependency 'autotest-growl'
+  s.add_development_dependency 'autotest-fsevent'
+
+  s.files         = `find *`.split("\n").uniq.sort.select{|f| !f.empty? }
+  s.test_files    = `find spec/*`.split("\n")
+  s.executables   = []
+  s.require_paths = ["lib"]
+end
diff --git a/samples/client/petstore/ruby/swagger/configuration.rb b/samples/client/petstore/ruby/swagger/configuration.rb
deleted file mode 100644
index c0b3c46268c..00000000000
--- a/samples/client/petstore/ruby/swagger/configuration.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module Swagger
-
-  class Configuration
-    require 'swagger/version'    
-    
-    attr_accessor :format, :api_key, :username, :password, :auth_token, :scheme, :host, :base_path, :user_agent, :logger, :inject_format, :force_ending_format, :camelize_params
-    
-    # Defaults go in here..
-    def initialize
-      @format = 'json'
-      @scheme = 'http'
-      @host = 'api.wordnik.com'
-      @base_path = '/v4'
-      @user_agent = "ruby-#{Swagger::VERSION}"
-      @inject_format = true
-      @force_ending_format = false
-      @camelize_params = true
-    end
-
-  end
-
-end
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/swagger/request.rb b/samples/client/petstore/ruby/swagger/request.rb
deleted file mode 100644
index 7836cb0bf03..00000000000
--- a/samples/client/petstore/ruby/swagger/request.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-module Swagger
-
-  class Request
-    require 'uri'
-    require 'addressable/uri'
-    require 'typhoeus'
-    require "swagger/version"
-
-    attr_accessor :host, :path, :format, :params, :body, :http_method, :headers
-
-
-    # All requests must have an HTTP method and a path
-    # Optionals parameters are :params, :headers, :body, :format, :host
-    # 
-    def initialize(http_method, path, attributes={})
-      attributes[:format] ||= Swagger.configuration.format
-      attributes[:params] ||= {}
-
-      # Set default headers
-      default_headers = {
-        'Content-Type' => "application/#{attributes[:format].downcase}",
-        :api_key => Swagger.configuration.api_key
-      }
-
-      # api_key from headers hash trumps the default, even if its value is blank
-      if attributes[:headers].present? && attributes[:headers].has_key?(:api_key)
-        default_headers.delete(:api_key)
-      end
-      
-      # api_key from params hash trumps all others (headers and default_headers)
-      if attributes[:params].present? && attributes[:params].has_key?(:api_key)
-        default_headers.delete(:api_key)
-        attributes[:headers].delete(:api_key) if attributes[:headers].present?
-      end
-      
-      # Merge argument headers into defaults
-      attributes[:headers] = default_headers.merge(attributes[:headers] || {})
-      
-      # Stick in the auth token if there is one
-      if Swagger.authenticated?
-        attributes[:headers].merge!({:auth_token => Swagger.configuration.auth_token})
-      end
-            
-      self.http_method = http_method.to_sym
-      self.path = path
-      attributes.each do |name, value|
-        send("#{name.to_s.underscore.to_sym}=", value)
-      end
-    end
-
-    # Construct a base URL
-    #
-    def url(options = {})  
-      u = Addressable::URI.new(
-        :scheme => Swagger.configuration.scheme,
-        :host => Swagger.configuration.host,
-        :path => self.interpreted_path,
-        :query => self.query_string.sub(/\?/, '')
-      ).to_s
-      
-      # Drop trailing question mark, if present
-      u.sub! /\?$/, ''
-      
-      # Obfuscate API key?
-      u.sub! /api\_key=\w+/, 'api_key=YOUR_API_KEY' if options[:obfuscated]
-      
-      u
-    end
-
-    # Iterate over the params hash, injecting any path values into the path string
-    #
-    # e.g. /word.{format}/{word}/entries => /word.json/cat/entries
-    def interpreted_path
-      p = self.path.dup
-
-      # Fill in the path params
-      self.params.each_pair do |key, value|
-        p = p.gsub("{#{key}}", value.to_s)
-      end
-
-      # Stick a .{format} placeholder into the path if there isn't
-      # one already or an actual format like json or xml
-      # e.g. /words/blah => /words.{format}/blah
-      if Swagger.configuration.inject_format
-        unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s }
-          p = p.sub(/^(\/?\w+)/, "\\1.#{format}")
-        end
-      end
-
-      # Stick a .{format} placeholder on the end of the path if there isn't
-      # one already or an actual format like json or xml
-      # e.g. /words/blah => /words/blah.{format}
-      if Swagger.configuration.force_ending_format
-        unless ['.json', '.xml', '{format}'].any? {|s| p.downcase.include? s }
-          p = "#{p}.#{format}"   
-        end
-      end
-
-      p = p.sub("{format}", self.format.to_s)
-      
-      URI.encode [Swagger.configuration.base_path, p].join("/").gsub(/\/+/, '/')
-    end
-  
-    # Massage the request body into a state of readiness
-    # If body is a hash, camelize all keys then convert to a json string
-    #
-    def body=(value)      
-      if value.is_a?(Hash)
-        value = value.inject({}) do |memo, (k,v)|
-          memo[k.to_s.camelize(:lower).to_sym] = v
-          memo
-        end
-      end
-      @body = value
-    end
-    
-    # If body is an object, JSONify it before making the actual request.
-    # 
-    def outgoing_body
-      body.is_a?(String) ? body : body.to_json
-    end
-    
-    # Construct a query string from the query-string-type params
-    def query_string
-
-      # Iterate over all params,
-      # .. removing the ones that are part of the path itself.
-      # .. stringifying values so Addressable doesn't blow up.
-      query_values = {}
-      self.params.each_pair do |key, value|
-        next if self.path.include? "{#{key}}"                                   # skip path params
-        next if value.blank? && value.class != FalseClass                       # skip empties
-        if Swagger.configuration.camelize_params
-          key = key.to_s.camelize(:lower).to_sym unless key.to_sym == :api_key    # api_key is not a camelCased param
-        end
-        query_values[key] = value.to_s
-      end
-    
-      # We don't want to end up with '?' as our query string
-      # if there aren't really any params
-      return "" if query_values.blank?
-    
-      # Addressable requires query_values to be set after initialization..
-      qs = Addressable::URI.new
-      qs.query_values = query_values
-      qs.to_s
-    end
-  
-    def make
-      logger = Logger.new STDOUT
-      logger.debug self.url
-      response = case self.http_method.to_sym
-      when :get,:GET
-        Typhoeus::Request.get(
-          self.url,
-          :headers => self.headers.stringify_keys,
-        )
-
-      when :post,:POST
-        Typhoeus::Request.post(
-          self.url,
-          :body => self.outgoing_body,
-          :headers => self.headers.stringify_keys,
-        )
-
-      when :put,:PUT
-        Typhoeus::Request.put(
-          self.url,
-          :body => self.outgoing_body,
-          :headers => self.headers.stringify_keys,
-        )
-      
-      when :delete,:DELETE
-        Typhoeus::Request.delete(
-          self.url,
-          :body => self.outgoing_body,
-          :headers => self.headers.stringify_keys,
-        )
-      end
-      Response.new(response)
-    end
-  
-    def response
-      self.make
-    end
-  
-    def response_code_pretty
-      return unless @response.present?
-      @response.code.to_s    
-    end
-  
-    def response_headers_pretty
-      return unless @response.present?
-      # JSON.pretty_generate(@response.headers).gsub(/\n/, '<br/>') # <- This was for RestClient
-      @response.headers.gsub(/\n/, '<br/>') # <- This is for Typhoeus
-    end
-
-  end
-end
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/swagger/response.rb b/samples/client/petstore/ruby/swagger/response.rb
deleted file mode 100644
index 02a1a458eb4..00000000000
--- a/samples/client/petstore/ruby/swagger/response.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-module Swagger
-
-  class Response
-    require 'json'
-
-    attr_accessor :raw
-
-    def initialize(raw)
-      self.raw = raw
-
-      case self.code
-      when 500..510 then raise(ServerError, self.error_message)
-      when 299..426 then raise(ClientError, self.error_message)
-      end
-    end
-
-    def code
-      raw.code
-    end
-    
-    # Account for error messages that take different forms...
-    def error_message
-      body['message']
-    rescue
-      body
-    end
-
-    # If body is JSON, parse it
-    # Otherwise return raw string
-    def body
-      JSON.parse raw.body
-    rescue
-      raw.body
-    end
-
-    # `headers_hash` is a Typhoeus-specific extension of Hash, 
-    # so simplify it back into a regular old Hash.
-    def headers
-      h = {}
-      raw.headers_hash.each {|k,v| h[k] = v }
-      h
-    end
-
-    # Extract the response format from the header hash
-    # e.g. {'Content-Type' => 'application/json'}
-    def format
-      headers['Content-Type'].split("/").last.downcase
-    end
-
-    def json?
-      format == 'json'
-    end
-
-    def xml?
-      format == 'xml'
-    end
-
-    def pretty_body
-      return unless body.present?
-      case format
-      when 'json' then JSON.pretty_generate(body).gsub(/\n/, '<br/>')
-      end
-    end
-
-    def pretty_headers
-      JSON.pretty_generate(headers).gsub(/\n/, '<br/>')
-    end
-    
-  end
-end
\ No newline at end of file
diff --git a/samples/client/petstore/ruby/swagger/version.rb b/samples/client/petstore/ruby/swagger/version.rb
deleted file mode 100644
index 39357c0ed6d..00000000000
--- a/samples/client/petstore/ruby/swagger/version.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Swagger
-  VERSION = "4.06.08"
-end
-
diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml
index 0ccbebeb0df..b6dd4493a0b 100644
--- a/samples/client/petstore/scala/pom.xml
+++ b/samples/client/petstore/scala/pom.xml
@@ -2,9 +2,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
-  <artifactId>swagger-client</artifactId>
+  <artifactId>swagger-scala-client</artifactId>
   <packaging>jar</packaging>
-  <name>swagger-client</name>
+  <name>swagger-scala-client</name>
   <version>1.0.0</version>
   <prerequisites>
     <maven>2.2.0</maven>
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
index 329d69a8ac9..f4b25de8306 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala
@@ -17,6 +17,7 @@ import scala.collection.JavaConverters._
 import scala.collection.mutable.HashMap
 
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
+import com.fasterxml.jackson.datatype.joda.JodaModule
 import com.fasterxml.jackson.core.JsonGenerator.Feature
 import com.fasterxml.jackson.databind._
 import com.fasterxml.jackson.annotation._
@@ -26,6 +27,7 @@ object ScalaJsonUtil {
   def getJsonMapper = {
     val mapper = new ObjectMapper()
     mapper.registerModule(new DefaultScalaModule())
+    mapper.registerModule(new JodaModule());
     mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT)
     mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
index 9af297b5252..242f64e5aec 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
@@ -18,6 +18,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
   
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store
+   * @return void
+   */
   def updatePet (body: Pet)  = {
     // create path and map variables
     val path = "/pet".replaceAll("\\{format\\}","json")
@@ -53,6 +59,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store
+   * @return void
+   */
   def addPet (body: Pet)  = {
     // create path and map variables
     val path = "/pet".replaceAll("\\{format\\}","json")
@@ -88,6 +100,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma seperated strings
+   * @param status Status values that need to be considered for filter
+   * @return List[Pet]
+   */
   def findPetsByStatus (status: List[String]) : Option[List[Pet]] = {
     // create path and map variables
     val path = "/pet/findByStatus".replaceAll("\\{format\\}","json")
@@ -122,6 +140,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Finds Pets by tags
+   * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by
+   * @return List[Pet]
+   */
   def findPetsByTags (tags: List[String]) : Option[List[Pet]] = {
     // create path and map variables
     val path = "/pet/findByTags".replaceAll("\\{format\\}","json")
@@ -156,6 +180,12 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Find pet by ID
+   * Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
+   * @param petId ID of pet that needs to be fetched
+   * @return Pet
+   */
   def getPetById (petId: Long) : Option[Pet] = {
     // create path and map variables
     val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
@@ -191,6 +221,14 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated
+   * @param name Updated name of the pet
+   * @param status Updated status of the pet
+   * @return void
+   */
   def updatePetWithForm (petId: String, name: String, status: String)  = {
     // create path and map variables
     val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
@@ -225,6 +263,13 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Deletes a pet
+   * 
+   * @param api_key 
+   * @param petId Pet id to delete
+   * @return void
+   */
   def deletePet (api_key: String, petId: Long)  = {
     // create path and map variables
     val path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
@@ -260,6 +305,14 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update
+   * @param additionalMetadata Additional data to pass to server
+   * @param file file to upload
+   * @return void
+   */
   def uploadFile (petId: Long, additionalMetadata: String, file: File)  = {
     // create path and map variables
     val path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}",apiInvoker.escape(petId))
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
index c5fa105fca9..9c7e1cfe583 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
@@ -17,6 +17,11 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
   
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map[String, Integer]
+   */
   def getInventory () : Option[Map[String, Integer]] = {
     // create path and map variables
     val path = "/store/inventory".replaceAll("\\{format\\}","json")
@@ -50,6 +55,12 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet
+   * @return Order
+   */
   def placeOrder (body: Order) : Option[Order] = {
     // create path and map variables
     val path = "/store/order".replaceAll("\\{format\\}","json")
@@ -86,6 +97,12 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched
+   * @return Order
+   */
   def getOrderById (orderId: String) : Option[Order] = {
     // create path and map variables
     val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))
@@ -121,6 +138,12 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted
+   * @return void
+   */
   def deleteOrder (orderId: String)  = {
     // create path and map variables
     val path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}",apiInvoker.escape(orderId))
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
index a46f19b9e68..62d96f90cfb 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
@@ -17,6 +17,12 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
   def addHeader(key: String, value: String) = apiInvoker.defaultHeaders += key -> value 
 
   
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object
+   * @return void
+   */
   def createUser (body: User)  = {
     // create path and map variables
     val path = "/user".replaceAll("\\{format\\}","json")
@@ -52,6 +58,12 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
   def createUsersWithArrayInput (body: List[User])  = {
     // create path and map variables
     val path = "/user/createWithArray".replaceAll("\\{format\\}","json")
@@ -87,6 +99,12 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object
+   * @return void
+   */
   def createUsersWithListInput (body: List[User])  = {
     // create path and map variables
     val path = "/user/createWithList".replaceAll("\\{format\\}","json")
@@ -122,6 +140,13 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login
+   * @param password The password for login in clear text
+   * @return String
+   */
   def loginUser (username: String, password: String) : Option[String] = {
     // create path and map variables
     val path = "/user/login".replaceAll("\\{format\\}","json")
@@ -157,6 +182,11 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Logs out current logged in user session
+   * 
+   * @return void
+   */
   def logoutUser ()  = {
     // create path and map variables
     val path = "/user/logout".replaceAll("\\{format\\}","json")
@@ -189,6 +219,12 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. 
+   * @return User
+   */
   def getUserByName (username: String) : Option[User] = {
     // create path and map variables
     val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
@@ -224,6 +260,13 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted
+   * @param body Updated user object
+   * @return void
+   */
   def updateUser (username: String, body: User)  = {
     // create path and map variables
     val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
@@ -261,6 +304,12 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
     }
   }
   
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted
+   * @return void
+   */
   def deleteUser (username: String)  = {
     // create path and map variables
     val path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
diff --git a/samples/client/petstore/tizen/client/SamiCategory.cpp b/samples/client/petstore/tizen/client/SamiCategory.cpp
index def45c65788..185b1f9d895 100644
--- a/samples/client/petstore/tizen/client/SamiCategory.cpp
+++ b/samples/client/petstore/tizen/client/SamiCategory.cpp
@@ -148,31 +148,31 @@ SamiCategory::asJsonObject() {
 
     
     JsonString *pIdKey = new JsonString(L"id");
-    pJsonObject->Add(pIdKey, toJson(getpId(), "Long", ""));
+    pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
     
     JsonString *pNameKey = new JsonString(L"name");
-    pJsonObject->Add(pNameKey, toJson(getpName(), "String", ""));
+    pJsonObject->Add(pNameKey, toJson(getPName(), "String", ""));
 
     
     return pJsonObject;
 }
 
 Long*
-SamiCategory::getpId() {
+SamiCategory::getPId() {
     return pId;
 }
 void
-SamiCategory::setpId(Long* pId) {
+SamiCategory::setPId(Long* pId) {
     this->pId = pId;
 }
 
 String*
-SamiCategory::getpName() {
+SamiCategory::getPName() {
     return pName;
 }
 void
-SamiCategory::setpName(String* pName) {
+SamiCategory::setPName(String* pName) {
     this->pName = pName;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiCategory.h b/samples/client/petstore/tizen/client/SamiCategory.h
index 17fb5370943..a361ea047fa 100644
--- a/samples/client/petstore/tizen/client/SamiCategory.h
+++ b/samples/client/petstore/tizen/client/SamiCategory.h
@@ -42,11 +42,11 @@ public:
     SamiCategory* fromJson(String* obj);
 
     
-    Long* getpId();
-    void setpId(Long* pId);
+    Long* getPId();
+    void setPId(Long* pId);
     
-    String* getpName();
-    void setpName(String* pName);
+    String* getPName();
+    void setPName(String* pName);
     
 
 private:
diff --git a/samples/client/petstore/tizen/client/SamiOrder.cpp b/samples/client/petstore/tizen/client/SamiOrder.cpp
index b029b2aeefe..a319e88e616 100644
--- a/samples/client/petstore/tizen/client/SamiOrder.cpp
+++ b/samples/client/petstore/tizen/client/SamiOrder.cpp
@@ -208,83 +208,83 @@ SamiOrder::asJsonObject() {
 
     
     JsonString *pIdKey = new JsonString(L"id");
-    pJsonObject->Add(pIdKey, toJson(getpId(), "Long", ""));
+    pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
     
     JsonString *pPetIdKey = new JsonString(L"petId");
-    pJsonObject->Add(pPetIdKey, toJson(getpPetId(), "Long", ""));
+    pJsonObject->Add(pPetIdKey, toJson(getPPetId(), "Long", ""));
 
     
     JsonString *pQuantityKey = new JsonString(L"quantity");
-    pJsonObject->Add(pQuantityKey, toJson(getpQuantity(), "Integer", ""));
+    pJsonObject->Add(pQuantityKey, toJson(getPQuantity(), "Integer", ""));
 
     
     JsonString *pShipDateKey = new JsonString(L"shipDate");
-    pJsonObject->Add(pShipDateKey, toJson(getpShipDate(), "DateTime", ""));
+    pJsonObject->Add(pShipDateKey, toJson(getPShipDate(), "DateTime", ""));
 
     
     JsonString *pStatusKey = new JsonString(L"status");
-    pJsonObject->Add(pStatusKey, toJson(getpStatus(), "String", ""));
+    pJsonObject->Add(pStatusKey, toJson(getPStatus(), "String", ""));
 
     
     JsonString *pCompleteKey = new JsonString(L"complete");
-    pJsonObject->Add(pCompleteKey, toJson(getpComplete(), "Boolean", ""));
+    pJsonObject->Add(pCompleteKey, toJson(getPComplete(), "Boolean", ""));
 
     
     return pJsonObject;
 }
 
 Long*
-SamiOrder::getpId() {
+SamiOrder::getPId() {
     return pId;
 }
 void
-SamiOrder::setpId(Long* pId) {
+SamiOrder::setPId(Long* pId) {
     this->pId = pId;
 }
 
 Long*
-SamiOrder::getpPetId() {
+SamiOrder::getPPetId() {
     return pPetId;
 }
 void
-SamiOrder::setpPetId(Long* pPetId) {
+SamiOrder::setPPetId(Long* pPetId) {
     this->pPetId = pPetId;
 }
 
 Integer*
-SamiOrder::getpQuantity() {
+SamiOrder::getPQuantity() {
     return pQuantity;
 }
 void
-SamiOrder::setpQuantity(Integer* pQuantity) {
+SamiOrder::setPQuantity(Integer* pQuantity) {
     this->pQuantity = pQuantity;
 }
 
 DateTime*
-SamiOrder::getpShipDate() {
+SamiOrder::getPShipDate() {
     return pShipDate;
 }
 void
-SamiOrder::setpShipDate(DateTime* pShipDate) {
+SamiOrder::setPShipDate(DateTime* pShipDate) {
     this->pShipDate = pShipDate;
 }
 
 String*
-SamiOrder::getpStatus() {
+SamiOrder::getPStatus() {
     return pStatus;
 }
 void
-SamiOrder::setpStatus(String* pStatus) {
+SamiOrder::setPStatus(String* pStatus) {
     this->pStatus = pStatus;
 }
 
 Boolean*
-SamiOrder::getpComplete() {
+SamiOrder::getPComplete() {
     return pComplete;
 }
 void
-SamiOrder::setpComplete(Boolean* pComplete) {
+SamiOrder::setPComplete(Boolean* pComplete) {
     this->pComplete = pComplete;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiOrder.h b/samples/client/petstore/tizen/client/SamiOrder.h
index bc1cf4af226..08b79cc195c 100644
--- a/samples/client/petstore/tizen/client/SamiOrder.h
+++ b/samples/client/petstore/tizen/client/SamiOrder.h
@@ -45,23 +45,23 @@ public:
     SamiOrder* fromJson(String* obj);
 
     
-    Long* getpId();
-    void setpId(Long* pId);
+    Long* getPId();
+    void setPId(Long* pId);
     
-    Long* getpPetId();
-    void setpPetId(Long* pPetId);
+    Long* getPPetId();
+    void setPPetId(Long* pPetId);
     
-    Integer* getpQuantity();
-    void setpQuantity(Integer* pQuantity);
+    Integer* getPQuantity();
+    void setPQuantity(Integer* pQuantity);
     
-    DateTime* getpShipDate();
-    void setpShipDate(DateTime* pShipDate);
+    DateTime* getPShipDate();
+    void setPShipDate(DateTime* pShipDate);
     
-    String* getpStatus();
-    void setpStatus(String* pStatus);
+    String* getPStatus();
+    void setPStatus(String* pStatus);
     
-    Boolean* getpComplete();
-    void setpComplete(Boolean* pComplete);
+    Boolean* getPComplete();
+    void setPComplete(Boolean* pComplete);
     
 
 private:
diff --git a/samples/client/petstore/tizen/client/SamiPet.cpp b/samples/client/petstore/tizen/client/SamiPet.cpp
index 6c5d101db43..ecf63f060a4 100644
--- a/samples/client/petstore/tizen/client/SamiPet.cpp
+++ b/samples/client/petstore/tizen/client/SamiPet.cpp
@@ -208,83 +208,83 @@ SamiPet::asJsonObject() {
 
     
     JsonString *pIdKey = new JsonString(L"id");
-    pJsonObject->Add(pIdKey, toJson(getpId(), "Long", ""));
+    pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
     
     JsonString *pCategoryKey = new JsonString(L"category");
-    pJsonObject->Add(pCategoryKey, toJson(getpCategory(), "SamiCategory", ""));
+    pJsonObject->Add(pCategoryKey, toJson(getPCategory(), "SamiCategory", ""));
 
     
     JsonString *pNameKey = new JsonString(L"name");
-    pJsonObject->Add(pNameKey, toJson(getpName(), "String", ""));
+    pJsonObject->Add(pNameKey, toJson(getPName(), "String", ""));
 
     
     JsonString *pPhotoUrlsKey = new JsonString(L"photoUrls");
-    pJsonObject->Add(pPhotoUrlsKey, toJson(getpPhotoUrls(), "String", "array"));
+    pJsonObject->Add(pPhotoUrlsKey, toJson(getPPhotoUrls(), "String", "array"));
 
     
     JsonString *pTagsKey = new JsonString(L"tags");
-    pJsonObject->Add(pTagsKey, toJson(getpTags(), "SamiTag", "array"));
+    pJsonObject->Add(pTagsKey, toJson(getPTags(), "SamiTag", "array"));
 
     
     JsonString *pStatusKey = new JsonString(L"status");
-    pJsonObject->Add(pStatusKey, toJson(getpStatus(), "String", ""));
+    pJsonObject->Add(pStatusKey, toJson(getPStatus(), "String", ""));
 
     
     return pJsonObject;
 }
 
 Long*
-SamiPet::getpId() {
+SamiPet::getPId() {
     return pId;
 }
 void
-SamiPet::setpId(Long* pId) {
+SamiPet::setPId(Long* pId) {
     this->pId = pId;
 }
 
 SamiCategory*
-SamiPet::getpCategory() {
+SamiPet::getPCategory() {
     return pCategory;
 }
 void
-SamiPet::setpCategory(SamiCategory* pCategory) {
+SamiPet::setPCategory(SamiCategory* pCategory) {
     this->pCategory = pCategory;
 }
 
 String*
-SamiPet::getpName() {
+SamiPet::getPName() {
     return pName;
 }
 void
-SamiPet::setpName(String* pName) {
+SamiPet::setPName(String* pName) {
     this->pName = pName;
 }
 
 IList*
-SamiPet::getpPhotoUrls() {
+SamiPet::getPPhotoUrls() {
     return pPhotoUrls;
 }
 void
-SamiPet::setpPhotoUrls(IList* pPhotoUrls) {
+SamiPet::setPPhotoUrls(IList* pPhotoUrls) {
     this->pPhotoUrls = pPhotoUrls;
 }
 
 IList*
-SamiPet::getpTags() {
+SamiPet::getPTags() {
     return pTags;
 }
 void
-SamiPet::setpTags(IList* pTags) {
+SamiPet::setPTags(IList* pTags) {
     this->pTags = pTags;
 }
 
 String*
-SamiPet::getpStatus() {
+SamiPet::getPStatus() {
     return pStatus;
 }
 void
-SamiPet::setpStatus(String* pStatus) {
+SamiPet::setPStatus(String* pStatus) {
     this->pStatus = pStatus;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiPet.h b/samples/client/petstore/tizen/client/SamiPet.h
index 30ae8872949..a1658248436 100644
--- a/samples/client/petstore/tizen/client/SamiPet.h
+++ b/samples/client/petstore/tizen/client/SamiPet.h
@@ -45,23 +45,23 @@ public:
     SamiPet* fromJson(String* obj);
 
     
-    Long* getpId();
-    void setpId(Long* pId);
+    Long* getPId();
+    void setPId(Long* pId);
     
-    SamiCategory* getpCategory();
-    void setpCategory(SamiCategory* pCategory);
+    SamiCategory* getPCategory();
+    void setPCategory(SamiCategory* pCategory);
     
-    String* getpName();
-    void setpName(String* pName);
+    String* getPName();
+    void setPName(String* pName);
     
-    IList* getpPhotoUrls();
-    void setpPhotoUrls(IList* pPhotoUrls);
+    IList* getPPhotoUrls();
+    void setPPhotoUrls(IList* pPhotoUrls);
     
-    IList* getpTags();
-    void setpTags(IList* pTags);
+    IList* getPTags();
+    void setPTags(IList* pTags);
     
-    String* getpStatus();
-    void setpStatus(String* pStatus);
+    String* getPStatus();
+    void setPStatus(String* pStatus);
     
 
 private:
diff --git a/samples/client/petstore/tizen/client/SamiTag.cpp b/samples/client/petstore/tizen/client/SamiTag.cpp
index 3e6b947c604..d07b64a531d 100644
--- a/samples/client/petstore/tizen/client/SamiTag.cpp
+++ b/samples/client/petstore/tizen/client/SamiTag.cpp
@@ -148,31 +148,31 @@ SamiTag::asJsonObject() {
 
     
     JsonString *pIdKey = new JsonString(L"id");
-    pJsonObject->Add(pIdKey, toJson(getpId(), "Long", ""));
+    pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
     
     JsonString *pNameKey = new JsonString(L"name");
-    pJsonObject->Add(pNameKey, toJson(getpName(), "String", ""));
+    pJsonObject->Add(pNameKey, toJson(getPName(), "String", ""));
 
     
     return pJsonObject;
 }
 
 Long*
-SamiTag::getpId() {
+SamiTag::getPId() {
     return pId;
 }
 void
-SamiTag::setpId(Long* pId) {
+SamiTag::setPId(Long* pId) {
     this->pId = pId;
 }
 
 String*
-SamiTag::getpName() {
+SamiTag::getPName() {
     return pName;
 }
 void
-SamiTag::setpName(String* pName) {
+SamiTag::setPName(String* pName) {
     this->pName = pName;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiTag.h b/samples/client/petstore/tizen/client/SamiTag.h
index af77f48ec48..6521b0a6bed 100644
--- a/samples/client/petstore/tizen/client/SamiTag.h
+++ b/samples/client/petstore/tizen/client/SamiTag.h
@@ -42,11 +42,11 @@ public:
     SamiTag* fromJson(String* obj);
 
     
-    Long* getpId();
-    void setpId(Long* pId);
+    Long* getPId();
+    void setPId(Long* pId);
     
-    String* getpName();
-    void setpName(String* pName);
+    String* getPName();
+    void setPName(String* pName);
     
 
 private:
diff --git a/samples/client/petstore/tizen/client/SamiUser.cpp b/samples/client/petstore/tizen/client/SamiUser.cpp
index 48c615e008d..916bec83d5a 100644
--- a/samples/client/petstore/tizen/client/SamiUser.cpp
+++ b/samples/client/petstore/tizen/client/SamiUser.cpp
@@ -238,109 +238,109 @@ SamiUser::asJsonObject() {
 
     
     JsonString *pIdKey = new JsonString(L"id");
-    pJsonObject->Add(pIdKey, toJson(getpId(), "Long", ""));
+    pJsonObject->Add(pIdKey, toJson(getPId(), "Long", ""));
 
     
     JsonString *pUsernameKey = new JsonString(L"username");
-    pJsonObject->Add(pUsernameKey, toJson(getpUsername(), "String", ""));
+    pJsonObject->Add(pUsernameKey, toJson(getPUsername(), "String", ""));
 
     
     JsonString *pFirstNameKey = new JsonString(L"firstName");
-    pJsonObject->Add(pFirstNameKey, toJson(getpFirstName(), "String", ""));
+    pJsonObject->Add(pFirstNameKey, toJson(getPFirstName(), "String", ""));
 
     
     JsonString *pLastNameKey = new JsonString(L"lastName");
-    pJsonObject->Add(pLastNameKey, toJson(getpLastName(), "String", ""));
+    pJsonObject->Add(pLastNameKey, toJson(getPLastName(), "String", ""));
 
     
     JsonString *pEmailKey = new JsonString(L"email");
-    pJsonObject->Add(pEmailKey, toJson(getpEmail(), "String", ""));
+    pJsonObject->Add(pEmailKey, toJson(getPEmail(), "String", ""));
 
     
     JsonString *pPasswordKey = new JsonString(L"password");
-    pJsonObject->Add(pPasswordKey, toJson(getpPassword(), "String", ""));
+    pJsonObject->Add(pPasswordKey, toJson(getPPassword(), "String", ""));
 
     
     JsonString *pPhoneKey = new JsonString(L"phone");
-    pJsonObject->Add(pPhoneKey, toJson(getpPhone(), "String", ""));
+    pJsonObject->Add(pPhoneKey, toJson(getPPhone(), "String", ""));
 
     
     JsonString *pUserStatusKey = new JsonString(L"userStatus");
-    pJsonObject->Add(pUserStatusKey, toJson(getpUserStatus(), "Integer", ""));
+    pJsonObject->Add(pUserStatusKey, toJson(getPUserStatus(), "Integer", ""));
 
     
     return pJsonObject;
 }
 
 Long*
-SamiUser::getpId() {
+SamiUser::getPId() {
     return pId;
 }
 void
-SamiUser::setpId(Long* pId) {
+SamiUser::setPId(Long* pId) {
     this->pId = pId;
 }
 
 String*
-SamiUser::getpUsername() {
+SamiUser::getPUsername() {
     return pUsername;
 }
 void
-SamiUser::setpUsername(String* pUsername) {
+SamiUser::setPUsername(String* pUsername) {
     this->pUsername = pUsername;
 }
 
 String*
-SamiUser::getpFirstName() {
+SamiUser::getPFirstName() {
     return pFirstName;
 }
 void
-SamiUser::setpFirstName(String* pFirstName) {
+SamiUser::setPFirstName(String* pFirstName) {
     this->pFirstName = pFirstName;
 }
 
 String*
-SamiUser::getpLastName() {
+SamiUser::getPLastName() {
     return pLastName;
 }
 void
-SamiUser::setpLastName(String* pLastName) {
+SamiUser::setPLastName(String* pLastName) {
     this->pLastName = pLastName;
 }
 
 String*
-SamiUser::getpEmail() {
+SamiUser::getPEmail() {
     return pEmail;
 }
 void
-SamiUser::setpEmail(String* pEmail) {
+SamiUser::setPEmail(String* pEmail) {
     this->pEmail = pEmail;
 }
 
 String*
-SamiUser::getpPassword() {
+SamiUser::getPPassword() {
     return pPassword;
 }
 void
-SamiUser::setpPassword(String* pPassword) {
+SamiUser::setPPassword(String* pPassword) {
     this->pPassword = pPassword;
 }
 
 String*
-SamiUser::getpPhone() {
+SamiUser::getPPhone() {
     return pPhone;
 }
 void
-SamiUser::setpPhone(String* pPhone) {
+SamiUser::setPPhone(String* pPhone) {
     this->pPhone = pPhone;
 }
 
 Integer*
-SamiUser::getpUserStatus() {
+SamiUser::getPUserStatus() {
     return pUserStatus;
 }
 void
-SamiUser::setpUserStatus(Integer* pUserStatus) {
+SamiUser::setPUserStatus(Integer* pUserStatus) {
     this->pUserStatus = pUserStatus;
 }
 
diff --git a/samples/client/petstore/tizen/client/SamiUser.h b/samples/client/petstore/tizen/client/SamiUser.h
index 24cc7b55638..a874f9c6245 100644
--- a/samples/client/petstore/tizen/client/SamiUser.h
+++ b/samples/client/petstore/tizen/client/SamiUser.h
@@ -43,29 +43,29 @@ public:
     SamiUser* fromJson(String* obj);
 
     
-    Long* getpId();
-    void setpId(Long* pId);
+    Long* getPId();
+    void setPId(Long* pId);
     
-    String* getpUsername();
-    void setpUsername(String* pUsername);
+    String* getPUsername();
+    void setPUsername(String* pUsername);
     
-    String* getpFirstName();
-    void setpFirstName(String* pFirstName);
+    String* getPFirstName();
+    void setPFirstName(String* pFirstName);
     
-    String* getpLastName();
-    void setpLastName(String* pLastName);
+    String* getPLastName();
+    void setPLastName(String* pLastName);
     
-    String* getpEmail();
-    void setpEmail(String* pEmail);
+    String* getPEmail();
+    void setPEmail(String* pEmail);
     
-    String* getpPassword();
-    void setpPassword(String* pPassword);
+    String* getPPassword();
+    void setPPassword(String* pPassword);
     
-    String* getpPhone();
-    void setpPhone(String* pPhone);
+    String* getPPhone();
+    void setPPhone(String* pPhone);
     
-    Integer* getpUserStatus();
-    void setpUserStatus(Integer* pUserStatus);
+    Integer* getPUserStatus();
+    void setPUserStatus(Integer* pUserStatus);
     
 
 private:
diff --git a/samples/dynamic-html/docs/assets/images/logo.png b/samples/dynamic-html/docs/assets/images/logo.png
index 7a217967d00..209e5a473fc 100644
Binary files a/samples/dynamic-html/docs/assets/images/logo.png and b/samples/dynamic-html/docs/assets/images/logo.png differ
diff --git a/samples/dynamic-html/docs/models/Category.html b/samples/dynamic-html/docs/models/Category.html
index 52e04b2072a..15c6820eead 100644
--- a/samples/dynamic-html/docs/models/Category.html
+++ b/samples/dynamic-html/docs/models/Category.html
@@ -2,13 +2,13 @@
 <h2>Category</h2>
   
 <ul class="parameter">
-  <li class="param-required-false">id : Long
+  <li class="param-required-">id : Long
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">name : String
+  <li class="param-required-">name : String
 	  <br/>
   </li>
 </ul>
diff --git a/samples/dynamic-html/docs/models/Order.html b/samples/dynamic-html/docs/models/Order.html
index cea3cef3fd6..82278a470c2 100644
--- a/samples/dynamic-html/docs/models/Order.html
+++ b/samples/dynamic-html/docs/models/Order.html
@@ -2,37 +2,37 @@
 <h2>Order</h2>
   
 <ul class="parameter">
-  <li class="param-required-false">id : Long
+  <li class="param-required-">id : Long
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">petId : Long
+  <li class="param-required-">petId : Long
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">quantity : Integer
+  <li class="param-required-">quantity : Integer
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">shipDate : Date
+  <li class="param-required-">shipDate : Date
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">status : String
+  <li class="param-required-">status : String
 	  <br/>Order Status
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">complete : Boolean
+  <li class="param-required-">complete : Boolean
 	  <br/>
   </li>
 </ul>
diff --git a/samples/dynamic-html/docs/models/Pet.html b/samples/dynamic-html/docs/models/Pet.html
index ea50d7f0299..17468477704 100644
--- a/samples/dynamic-html/docs/models/Pet.html
+++ b/samples/dynamic-html/docs/models/Pet.html
@@ -2,13 +2,13 @@
 <h2>Pet</h2>
   
 <ul class="parameter">
-  <li class="param-required-false">id : Long
+  <li class="param-required-">id : Long
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">category : Category
+  <li class="param-required-">category : Category
 	  <br/>
   </li>
 </ul>
@@ -26,13 +26,13 @@
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">tags : List
+  <li class="param-required-">tags : List
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">status : String
+  <li class="param-required-">status : String
 	  <br/>pet status in the store
   </li>
 </ul>
diff --git a/samples/dynamic-html/docs/models/Tag.html b/samples/dynamic-html/docs/models/Tag.html
index ba0314f1c41..e84b50d73d6 100644
--- a/samples/dynamic-html/docs/models/Tag.html
+++ b/samples/dynamic-html/docs/models/Tag.html
@@ -2,13 +2,13 @@
 <h2>Tag</h2>
   
 <ul class="parameter">
-  <li class="param-required-false">id : Long
+  <li class="param-required-">id : Long
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">name : String
+  <li class="param-required-">name : String
 	  <br/>
   </li>
 </ul>
diff --git a/samples/dynamic-html/docs/models/User.html b/samples/dynamic-html/docs/models/User.html
index 41f7e2376f1..c71cf6649d7 100644
--- a/samples/dynamic-html/docs/models/User.html
+++ b/samples/dynamic-html/docs/models/User.html
@@ -2,49 +2,49 @@
 <h2>User</h2>
   
 <ul class="parameter">
-  <li class="param-required-false">id : Long
+  <li class="param-required-">id : Long
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">username : String
+  <li class="param-required-">username : String
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">firstName : String
+  <li class="param-required-">firstName : String
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">lastName : String
+  <li class="param-required-">lastName : String
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">email : String
+  <li class="param-required-">email : String
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">password : String
+  <li class="param-required-">password : String
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">phone : String
+  <li class="param-required-">phone : String
 	  <br/>
   </li>
 </ul>
   
 <ul class="parameter">
-  <li class="param-required-false">userStatus : Integer
+  <li class="param-required-">userStatus : Integer
 	  <br/>User Status
   </li>
 </ul>
diff --git a/samples/html/index.html b/samples/html/index.html
index 0efac5d4bee..bab16472c30 100644
--- a/samples/html/index.html
+++ b/samples/html/index.html
@@ -6,13 +6,14 @@
   </head>
   <body>
   <h1>Swagger Petstore</h1>
-    <div class="app-desc">This is a sample server Petstore server.  You can find out more about Swagger at <a href="http://swagger.io">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key "special-key" to test the authorization filters for our Partner</div>
+    <div class="app-desc">This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters for </div>
     
     <div class="app-desc">Contact Info: <a href="apiteam@wordnik.com">apiteam@wordnik.com</a></div>
+    <div class="app-desc">Version: 1.0.0</div>
     <div class="license-info">Apache 2.0</div>
     <div class="license-url">http://www.apache.org/licenses/LICENSE-2.0.html</div>
   <h2>Access</h2>
-  <div class="method-summary">Access to the API requires an api key to be provided by our Partner for all requests.  The api key is passed as a header with the name `api_key` and the value provided by Reverb Technologies, Inc.  Unless otherwise agreed upon, access to the Reverb API is intended solely for usage by our Partner and not third parties.</div>
+  <div class="method-summary">Customize this message as you see fit!</div>
   <h2>Methods</h2>
   
   
@@ -97,6 +98,14 @@
     <div class="return-type"><a href="#">String</a></div>
 
     
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/json</div>
+    <pre class="example"><code>"aeiou"</code></pre>
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/xml</div>
+    <pre class="example"><code>string</code></pre>
+    
   </div> <!-- method -->
   <hr>
   
@@ -134,6 +143,14 @@
     <div class="return-type"><a href="#">User</a></div>
 
     
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/json</div>
+    <pre class="example"><code>{\n  "id" : 123456789,\n  "lastName" : "aeiou",\n  "phone" : "aeiou",\n  "username" : "aeiou",\n  "email" : "aeiou",\n  "userStatus" : 123,\n  "firstName" : "aeiou",\n  "password" : "aeiou"\n}</code></pre>
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/xml</div>
+    <pre class="example"><code><User>\n  <id>123456</id>\n  <username>string</username>\n  <firstName>string</firstName>\n  <lastName>string</lastName>\n  <email>string</email>\n  <password>string</password>\n  <phone>string</phone>\n  <userStatus>0</userStatus>\n</User></code></pre>
+    
   </div> <!-- method -->
   <hr>
   
@@ -182,85 +199,6 @@
   
   
   
-  <div class="method">
-    <div class="method-path"><pre class="get"><code class="huge"><span>get</span>: /store/inventory</code></pre></div>
-    <div class="method-summary"><span class="nickname">getInventory</span> Returns pet inventories by status</div>
-    <div class="method-notes">Returns a map of status codes to quantities</div>
-
-    <h3 class="field-label">Parameters</h3>
-    <div class="field-items">
-      
-    </div>  <!-- field-items -->
-    <h3 class="field-label">Return type</h3>
-
-    <div class="return-type"><a href="#map">map[String, Integer]</a></div>
-
-    
-  </div> <!-- method -->
-  <hr>
-  
-  <div class="method">
-    <div class="method-path"><pre class="post"><code class="huge"><span>post</span>: /store/order</code></pre></div>
-    <div class="method-summary"><span class="nickname">placeOrder</span> Place an order for a pet</div>
-    <div class="method-notes"></div>
-
-    <h3 class="field-label">Parameters</h3>
-    <div class="field-items">
-      <div class="param">body (optional)</div>
-
-      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; order placed for purchasing the pet </div>
-      
-    </div>  <!-- field-items -->
-    <h3 class="field-label">Return type</h3>
-
-    <div class="return-type"><a href="#">Order</a></div>
-
-    
-  </div> <!-- method -->
-  <hr>
-  
-  <div class="method">
-    <div class="method-path"><pre class="get"><code class="huge"><span>get</span>: /store/order/{orderId}</code></pre></div>
-    <div class="method-summary"><span class="nickname">getOrderById</span> Find purchase order by ID</div>
-    <div class="method-notes">For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions</div>
-
-    <h3 class="field-label">Parameters</h3>
-    <div class="field-items">
-      <div class="param">orderId (required)</div>
-
-      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet that needs to be fetched </div>
-      
-    </div>  <!-- field-items -->
-    <h3 class="field-label">Return type</h3>
-
-    <div class="return-type"><a href="#">Order</a></div>
-
-    
-  </div> <!-- method -->
-  <hr>
-  
-  <div class="method">
-    <div class="method-path"><pre class="delete"><code class="huge"><span>delete</span>: /store/order/{orderId}</code></pre></div>
-    <div class="method-summary"><span class="nickname">deleteOrder</span> Delete purchase order by ID</div>
-    <div class="method-notes">For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors</div>
-
-    <h3 class="field-label">Parameters</h3>
-    <div class="field-items">
-      <div class="param">orderId (required)</div>
-
-      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of the order that needs to be deleted </div>
-      
-    </div>  <!-- field-items -->
-    <h3 class="field-label">Return type</h3>
-
-    <div class="return-type"><a href="#"></a></div>
-
-    
-  </div> <!-- method -->
-  <hr>
-  
-  
-  
   <div class="method">
     <div class="method-path"><pre class="put"><code class="huge"><span>put</span>: /pet</code></pre></div>
     <div class="method-summary"><span class="nickname">updatePet</span> Update an existing pet</div>
@@ -318,6 +256,14 @@
     <div class="return-type"><a href="#array">array[Pet]</a></div>
 
     
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/json</div>
+    <pre class="example"><code>[ {\n  "tags" : [ {\n    "id" : 123456789,\n    "name" : "aeiou"\n  } ],\n  "id" : 123456789,\n  "category" : {\n    "id" : 123456789,\n    "name" : "aeiou"\n  },\n  "status" : "aeiou",\n  "name" : "doggie",\n  "photoUrls" : [ "aeiou" ]\n} ]</code></pre>
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/xml</div>
+    <pre class="example"><code><Pet>\n  <id>123456</id>\n  <Category>\n    <id>123456</id>\n    <name>string</name>\n  </Category>\n  <name>doggie</name>\n  <photoUrls>string</photoUrls>\n  <Tag>\n    <id>123456</id>\n    <name>string</name>\n  </Tag>\n  <status>string</status>\n</Pet></code></pre>
+    
   </div> <!-- method -->
   <hr>
   
@@ -338,6 +284,14 @@
     <div class="return-type"><a href="#array">array[Pet]</a></div>
 
     
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/json</div>
+    <pre class="example"><code>[ {\n  "tags" : [ {\n    "id" : 123456789,\n    "name" : "aeiou"\n  } ],\n  "id" : 123456789,\n  "category" : {\n    "id" : 123456789,\n    "name" : "aeiou"\n  },\n  "status" : "aeiou",\n  "name" : "doggie",\n  "photoUrls" : [ "aeiou" ]\n} ]</code></pre>
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/xml</div>
+    <pre class="example"><code><Pet>\n  <id>123456</id>\n  <Category>\n    <id>123456</id>\n    <name>string</name>\n  </Category>\n  <name>doggie</name>\n  <photoUrls>string</photoUrls>\n  <Tag>\n    <id>123456</id>\n    <name>string</name>\n  </Tag>\n  <status>string</status>\n</Pet></code></pre>
+    
   </div> <!-- method -->
   <hr>
   
@@ -358,6 +312,14 @@
     <div class="return-type"><a href="#">Pet</a></div>
 
     
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/json</div>
+    <pre class="example"><code>{\n  "tags" : [ {\n    "id" : 123456789,\n    "name" : "aeiou"\n  } ],\n  "id" : 123456789,\n  "category" : {\n    "id" : 123456789,\n    "name" : "aeiou"\n  },\n  "status" : "aeiou",\n  "name" : "doggie",\n  "photoUrls" : [ "aeiou" ]\n}</code></pre>
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/xml</div>
+    <pre class="example"><code><Pet>\n  <id>123456</id>\n  <Category>\n    <id>123456</id>\n    <name>string</name>\n  </Category>\n  <name>doggie</name>\n  <photoUrls>string</photoUrls>\n  <Tag>\n    <id>123456</id>\n    <name>string</name>\n  </Tag>\n  <status>string</status>\n</Pet></code></pre>
+    
   </div> <!-- method -->
   <hr>
   
@@ -417,12 +379,9 @@
 
     <h3 class="field-label">Parameters</h3>
     <div class="field-items">
-<<<<<<< HEAD
-=======
       <div class="param">petId (required)</div>
 
       <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet to update </div>
->>>>>>> master
       <div class="param">additionalMetadata (optional)</div>
 
       <div class="param-desc"><span class="param-type">Form Parameter</span> &mdash; Additional data to pass to server </div>
@@ -440,6 +399,109 @@
   <hr>
   
   
+  
+  <div class="method">
+    <div class="method-path"><pre class="get"><code class="huge"><span>get</span>: /store/inventory</code></pre></div>
+    <div class="method-summary"><span class="nickname">getInventory</span> Returns pet inventories by status</div>
+    <div class="method-notes">Returns a map of status codes to quantities</div>
+
+    <h3 class="field-label">Parameters</h3>
+    <div class="field-items">
+      
+    </div>  <!-- field-items -->
+    <h3 class="field-label">Return type</h3>
+
+    <div class="return-type"><a href="#map">map[String, Integer]</a></div>
+
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/json</div>
+    <pre class="example"><code>{\n  "key" : 123\n}</code></pre>
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/xml</div>
+    <pre class="example"><code>not implemented com.wordnik.swagger.models.properties.MapProperty@3c536f11</code></pre>
+    
+  </div> <!-- method -->
+  <hr>
+  
+  <div class="method">
+    <div class="method-path"><pre class="post"><code class="huge"><span>post</span>: /store/order</code></pre></div>
+    <div class="method-summary"><span class="nickname">placeOrder</span> Place an order for a pet</div>
+    <div class="method-notes"></div>
+
+    <h3 class="field-label">Parameters</h3>
+    <div class="field-items">
+      <div class="param">body (optional)</div>
+
+      <div class="param-desc"><span class="param-type">Body Parameter</span> &mdash; order placed for purchasing the pet </div>
+      
+    </div>  <!-- field-items -->
+    <h3 class="field-label">Return type</h3>
+
+    <div class="return-type"><a href="#">Order</a></div>
+
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/json</div>
+    <pre class="example"><code>{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-04-16T14:41:29.883+0000"\n}</code></pre>
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/xml</div>
+    <pre class="example"><code><Order>\n  <id>123456</id>\n  <petId>123456</petId>\n  <quantity>0</quantity>\n  <shipDate>2015-04-16T22:41:29.886Z</shipDate>\n  <status>string</status>\n  <complete>true</complete>\n</Order></code></pre>
+    
+  </div> <!-- method -->
+  <hr>
+  
+  <div class="method">
+    <div class="method-path"><pre class="get"><code class="huge"><span>get</span>: /store/order/{orderId}</code></pre></div>
+    <div class="method-summary"><span class="nickname">getOrderById</span> Find purchase order by ID</div>
+    <div class="method-notes">For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions</div>
+
+    <h3 class="field-label">Parameters</h3>
+    <div class="field-items">
+      <div class="param">orderId (required)</div>
+
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of pet that needs to be fetched </div>
+      
+    </div>  <!-- field-items -->
+    <h3 class="field-label">Return type</h3>
+
+    <div class="return-type"><a href="#">Order</a></div>
+
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/json</div>
+    <pre class="example"><code>{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-04-16T14:41:29.887+0000"\n}</code></pre>
+    
+    <h3 class="field-label">Example data</h3>
+    <div class="example-data-content-type">Content-Type: application/xml</div>
+    <pre class="example"><code><Order>\n  <id>123456</id>\n  <petId>123456</petId>\n  <quantity>0</quantity>\n  <shipDate>2015-04-16T22:41:29.888Z</shipDate>\n  <status>string</status>\n  <complete>true</complete>\n</Order></code></pre>
+    
+  </div> <!-- method -->
+  <hr>
+  
+  <div class="method">
+    <div class="method-path"><pre class="delete"><code class="huge"><span>delete</span>: /store/order/{orderId}</code></pre></div>
+    <div class="method-summary"><span class="nickname">deleteOrder</span> Delete purchase order by ID</div>
+    <div class="method-notes">For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors</div>
+
+    <h3 class="field-label">Parameters</h3>
+    <div class="field-items">
+      <div class="param">orderId (required)</div>
+
+      <div class="param-desc"><span class="param-type">Path Parameter</span> &mdash; ID of the order that needs to be deleted </div>
+      
+    </div>  <!-- field-items -->
+    <h3 class="field-label">Return type</h3>
+
+    <div class="return-type"><a href="#"></a></div>
+
+    
+  </div> <!-- method -->
+  <hr>
+  
+  
 
   <h2>Models</h2>
   
diff --git a/samples/server/petstore/jaxrs/pom.xml b/samples/server/petstore/jaxrs/pom.xml
index 0a7f0f935c7..b2761f0369a 100644
--- a/samples/server/petstore/jaxrs/pom.xml
+++ b/samples/server/petstore/jaxrs/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
-  <artifactId>swagger-server</artifactId>
+  <artifactId>swagger-jaxrs-server</artifactId>
   <packaging>jar</packaging>
-  <name>swagger-server</name>
+  <name>swagger-jaxrs-server</name>
   <version>1.0.0</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
@@ -26,31 +26,27 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>${jetty-version}</version>
         <configuration>
-          <webAppConfig>
-            <contextPath>/v2</contextPath>
-          </webAppConfig>
+          <webApp>
+            <contextPath>/</contextPath>
+          </webApp>
           <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
-          <webDefaultXml>${project.basedir}/conf/jetty/webdefault.xml</webDefaultXml>
           <stopPort>8079</stopPort>
           <stopKey>stopit</stopKey>
-          <connectors>
-            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-              <port>8002</port>
-              <maxIdleTime>60000</maxIdleTime>
-              <confidentialPort>8443</confidentialPort>
-            </connector>
-          </connectors>
+          <httpConnector>
+            <port>8080</port>
+            <idleTimeout>60000</idleTimeout>
+          </httpConnector>
         </configuration>
         <executions>
           <execution>
             <id>start-jetty</id>
             <phase>pre-integration-test</phase>
             <goals>
-              <goal>run</goal>
+              <goal>start</goal>
             </goals>
             <configuration>
               <scanIntervalSeconds>0</scanIntervalSeconds>
@@ -133,8 +129,8 @@
     </repository>
   </repositories>
   <properties>
-    <swagger-core-version>1.5.3-M1-SNAPSHOT</swagger-core-version>
-    <jetty-version>8.1.11.v20130520</jetty-version>
+    <swagger-core-version>2.1.1-M2-SNAPSHOT</swagger-core-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey-version>1.13</jersey-version>
     <slf4j-version>1.6.3</slf4j-version>
     <scala-test-version>1.6.1</scala-test-version>
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/PetApi.java
index d3a57a3ad00..8b3b9d40b06 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/PetApi.java
@@ -26,7 +26,7 @@ public class PetApi {
   
   @PUT
   
-  @Consumes({ "application/json", "application/xml" })
+  @Consumes({ "application/json", "application/xml",  })
   @Produces({ "application/json", "application/xml" })
   @com.wordnik.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class)
   @com.wordnik.swagger.annotations.ApiResponses(value = { 
@@ -45,7 +45,7 @@ public class PetApi {
   
   @POST
   
-  @Consumes({ "application/json", "application/xml" })
+  @Consumes({ "application/json", "application/xml",  })
   @Produces({ "application/json", "application/xml" })
   @com.wordnik.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class)
   @com.wordnik.swagger.annotations.ApiResponses(value = { 
@@ -113,7 +113,7 @@ public class PetApi {
   
   @POST
   @Path("/{petId}")
-  @Consumes({ "application/x-www-form-urlencoded" })
+  @Consumes({ "application/x-www-form-urlencoded",  })
   @Produces({ "application/json", "application/xml" })
   @com.wordnik.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class)
   @com.wordnik.swagger.annotations.ApiResponses(value = { 
@@ -136,7 +136,7 @@ public class PetApi {
   @com.wordnik.swagger.annotations.ApiResponses(value = { 
     @com.wordnik.swagger.annotations.ApiResponse(code = 400, message = "Invalid pet value") })
 
-  public Response deletePet(@ApiParam(value = ""  )@HeaderParam("api_key") String api_key,
+  public Response deletePet(@ApiParam(value = ""  )@HeaderParam("api_key") String apiKey,
     @ApiParam(value = "Pet id to delete",required=true ) @PathParam("petId") Long petId)
       throws NotFoundException {
       // do some magic!
@@ -146,7 +146,7 @@ public class PetApi {
   
   @POST
   @Path("/{petId}/uploadImage")
-  @Consumes({ "multipart/form-data" })
+  @Consumes({ "multipart/form-data",  })
   @Produces({ "application/json", "application/xml" })
   @com.wordnik.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = Void.class)
   @com.wordnik.swagger.annotations.ApiResponses(value = { 
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Category.java
index 7c67f92e745..98cc0b4d273 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Category.java
@@ -14,7 +14,7 @@ public class Category  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -26,7 +26,7 @@ public class Category  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Order.java
index 884686b1cd7..cff15e3bd2a 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Order.java
@@ -22,7 +22,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -34,7 +34,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("petId")
   public Long getPetId() {
     return petId;
@@ -46,7 +46,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
@@ -58,7 +58,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
   public Date getShipDate() {
     return shipDate;
@@ -71,7 +71,7 @@ public class Order  {
   /**
    * Order Status
    **/
-  @ApiModelProperty(required = false, value = "Order Status")
+  @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
@@ -83,7 +83,7 @@ public class Order  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java
index 5a5cc2c8fb0..e8503c6bd31 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java
@@ -24,7 +24,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -36,7 +36,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("category")
   public Category getCategory() {
     return category;
@@ -72,7 +72,7 @@ public class Pet  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
@@ -85,7 +85,7 @@ public class Pet  {
   /**
    * pet status in the store
    **/
-  @ApiModelProperty(required = false, value = "pet status in the store")
+  @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Tag.java
index 4f98cb9ab63..d99a24f8cc1 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Tag.java
@@ -14,7 +14,7 @@ public class Tag  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -26,7 +26,7 @@ public class Tag  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("name")
   public String getName() {
     return name;
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/User.java
index 1af13243019..24d707e921f 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/User.java
@@ -20,7 +20,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("id")
   public Long getId() {
     return id;
@@ -32,7 +32,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("username")
   public String getUsername() {
     return username;
@@ -44,7 +44,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
@@ -56,7 +56,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
@@ -68,7 +68,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("email")
   public String getEmail() {
     return email;
@@ -80,7 +80,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("password")
   public String getPassword() {
     return password;
@@ -92,7 +92,7 @@ public class User  {
   
   /**
    **/
-  @ApiModelProperty(required = false, value = "")
+  @ApiModelProperty(value = "")
   @JsonProperty("phone")
   public String getPhone() {
     return phone;
@@ -105,7 +105,7 @@ public class User  {
   /**
    * User Status
    **/
-  @ApiModelProperty(required = false, value = "User Status")
+  @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml b/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml
index 2708ad5dd48..0dde6168d62 100644
--- a/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml
+++ b/samples/server/petstore/jaxrs/src/main/webapp/WEB-INF/web.xml
@@ -34,7 +34,7 @@
     </init-param>
     <init-param>
       <param-name>swagger.api.basepath</param-name>
-      <param-value>http://localhost:8002</param-value>
+      <param-value>http://localhost:8080</param-value>
     </init-param>
     <load-on-startup>2</load-on-startup>
   </servlet>
diff --git a/samples/server/petstore/spring-mvc/README.md b/samples/server/petstore/spring-mvc/README.md
new file mode 100644
index 00000000000..3ec7c5d70ea
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/README.md
@@ -0,0 +1,11 @@
+# Swagger generated server
+
+Spring MVC Server
+
+
+## Overview
+This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.  By using the [swagger-spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub.  This is an example of building a swagger-enabled server in Java using the Spring MVC framework.
+
+The underlying library integrating swagger to Spring-MVC is [springfox](https://github.com/springfox/springfox)
+
+You can view the server in swagger-ui by pointing to http://localhost:8002/v2/sdoc.jsp
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml
new file mode 100644
index 00000000000..5f6ab531f10
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/pom.xml
@@ -0,0 +1,229 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.swagger</groupId>
+  <artifactId>swagger-spring-mvc-server</artifactId>
+  <packaging>jar</packaging>
+  <name>swagger-spring-mvc-server</name>
+  <version>1.0.0</version>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty-version}</version>
+        <configuration>
+          <webAppConfig>
+            <contextPath>/v2</contextPath>
+          </webAppConfig>
+          <webAppSourceDirectory>target/${project.artifactId}-${project-version}</webAppSourceDirectory>
+          <webDefaultXml>${project.basedir}/conf/jetty/webdefault.xml</webDefaultXml>
+          <stopPort>8079</stopPort>
+          <stopKey>stopit</stopKey>
+          <httpConnector>
+            <port>8002</port>
+            <idleTimeout>60000</idleTimeout>
+          </httpConnector>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>swagger-ui</id>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/${project.artifactId}-${project.version}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/swagger-ui-${swagger-ui-version}/dist</directory>
+                  <filtering>true</filtering>
+                  <excludes>
+                    <exclude>index.html</exclude>
+                  </excludes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>com.wordnik</groupId>
+      <artifactId>swagger-jersey-jaxrs</artifactId>
+      <version>${swagger-core-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-servlet</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey.contribs</groupId>
+      <artifactId>jersey-multipart</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+
+    <!--Spring dependencies -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring-version}</version>
+    </dependency>
+
+    <!--SpringFox dependencies-->
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-core</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-spi</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-spring-web</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger2</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-swagger-ui</artifactId>
+      <version>${springfox-version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.scalatest</groupId>
+      <artifactId>scalatest_2.9.1</artifactId>
+      <version>${scala-test-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api-version}</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>jcenter-snapshots</id>
+      <name>jcenter</name>
+      <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
+    </repository>
+  </repositories>
+  <properties>
+    <swagger-core-version>1.5.3-M1-SNAPSHOT</swagger-core-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
+    <swagger-ui-version>2.1.0-M2</swagger-ui-version>
+    <jersey-version>1.13</jersey-version>
+    <slf4j-version>1.6.3</slf4j-version>
+    <scala-test-version>1.6.1</scala-test-version>
+    <junit-version>4.8.1</junit-version>
+    <servlet-api-version>2.5</servlet-api-version>
+    <springfox-version>2.0.0-SNAPSHOT</springfox-version>
+    <spring-version>4.0.9.RELEASE</spring-version>
+  </properties>
+</project>
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
new file mode 100644
index 00000000000..cae767c0393
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
@@ -0,0 +1,9 @@
+package io.swagger.api;
+
+public class ApiException extends Exception{
+	private int code;
+	public ApiException (int code, String msg) {
+		super(msg);
+		this.code = code;
+	}
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
new file mode 100644
index 00000000000..c2eeacf13d3
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
@@ -0,0 +1,26 @@
+package io.swagger.api;
+
+import java.io.IOException;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+
+public class ApiOriginFilter implements javax.servlet.Filter {
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		HttpServletResponse res = (HttpServletResponse) response;
+		res.addHeader("Access-Control-Allow-Origin", "*");
+		res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+		res.addHeader("Access-Control-Allow-Headers", "Content-Type");
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void destroy() {
+	}
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+	}
+}
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
new file mode 100644
index 00000000000..9e5b0ee44e2
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
@@ -0,0 +1,68 @@
+package io.swagger.api;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+@javax.xml.bind.annotation.XmlRootElement
+public class ApiResponseMessage {
+	public static final int ERROR = 1;
+	public static final int WARNING = 2;
+	public static final int INFO = 3;
+	public static final int OK = 4;
+	public static final int TOO_BUSY = 5;
+
+	int code;
+	String type;
+	String message;
+	
+	public ApiResponseMessage(){}
+	
+	public ApiResponseMessage(int code, String message){
+		this.code = code;
+		switch(code){
+		case ERROR:
+			setType("error");
+			break;
+		case WARNING:
+			setType("warning");
+			break;
+		case INFO:
+			setType("info");
+			break;
+		case OK:
+			setType("ok");
+			break;
+		case TOO_BUSY:
+			setType("too busy");
+			break;
+		default:
+			setType("unknown");
+			break;
+		}
+		this.message = message;
+	}
+
+	@XmlTransient
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
new file mode 100644
index 00000000000..9c8410e47ab
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
@@ -0,0 +1,9 @@
+package io.swagger.api;
+
+public class NotFoundException extends ApiException {
+	private int code;
+	public NotFoundException (int code, String msg) {
+		super(code, msg);
+		this.code = code;
+	}
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
new file mode 100644
index 00000000000..e58a4c2c120
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
@@ -0,0 +1,169 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import io.swagger.model.Pet;
+import java.io.File;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/pet", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/pet", description = "the pet API")
+public class PetApi {
+  
+
+  @ApiOperation(value = "Update an existing pet", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 405, message = "Validation exception"),
+    @ApiResponse(code = 404, message = "Pet not found"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied") })
+  @RequestMapping(value = "", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "application/json", "application/xml",  },
+    method = RequestMethod.PUT)
+  public ResponseEntity<Void> updatePet(@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 405, message = "Invalid input") })
+  @RequestMapping(value = "", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "application/json", "application/xml",  },
+    method = RequestMethod.POST)
+  public ResponseEntity<Void> addPet(@ApiParam(value = "Pet object that needs to be added to the store"  ) Pet body)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma seperated strings", response = Pet.class, responseContainer = "List")
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid status value") })
+  @RequestMapping(value = "/findByStatus", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Pet> findPetsByStatus(@ApiParam(value = "Status values that need to be considered for filter") @RequestParam("status") List<String> status)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Pet>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Finds Pets by tags", notes = "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List")
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid tag value") })
+  @RequestMapping(value = "/findByTags", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Pet> findPetsByTags(@ApiParam(value = "Tags to filter by") @RequestParam("tags") List<String> tags)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Pet>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions", response = Pet.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 404, message = "Pet not found"),
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied") })
+  @RequestMapping(value = "/{petId}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("petId") Long petId)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Pet>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 405, message = "Invalid input") })
+  @RequestMapping(value = "/{petId}", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "application/x-www-form-urlencoded",  },
+    method = RequestMethod.POST)
+  public ResponseEntity<Void> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated",required=true ) @PathVariable("petId") String petId,
+    
+@ApiParam(value = "Updated name of the pet" )@RequestPart("name")  String name,
+    
+@ApiParam(value = "Updated status of the pet" )@RequestPart("status")  String status)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Deletes a pet", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 400, message = "Invalid pet value") })
+  @RequestMapping(value = "/{petId}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.DELETE)
+  public ResponseEntity<Void> deletePet(@ApiParam(value = ""  )@RequestHeader("apiKey") String apiKey,
+    @ApiParam(value = "Pet id to delete",required=true ) @PathVariable("petId") Long petId)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "uploads an image", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 0, message = "successful operation") })
+  @RequestMapping(value = "/{petId}/uploadImage", 
+    produces = { "application/json", "application/xml" }, 
+    consumes = { "multipart/form-data",  },
+    method = RequestMethod.POST)
+  public ResponseEntity<Void> uploadFile(@ApiParam(value = "ID of pet to update",required=true ) @PathVariable("petId") Long petId,
+    
+@ApiParam(value = "Additional data to pass to server" )@RequestPart("additionalMetadata")  String additionalMetadata,
+    @ApiParam(value = "file detail") @RequestPart("file") MultipartFile fileDetail)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
new file mode 100644
index 00000000000..4f3eb963e16
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
@@ -0,0 +1,99 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import java.util.Map;
+import io.swagger.model.Order;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/store", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/store", description = "the store API")
+public class StoreApi {
+  
+
+  @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "map")
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation") })
+  @RequestMapping(value = "/inventory", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Integer> getInventory()
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Integer>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Place an order for a pet", notes = "", response = Order.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid Order") })
+  @RequestMapping(value = "/order", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.POST)
+  public ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet"  ) Order body)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 404, message = "Order not found"),
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied") })
+  @RequestMapping(value = "/order/{orderId}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Order> getOrderById(@ApiParam(value = "ID of pet that needs to be fetched",required=true ) @PathVariable("orderId") String orderId)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Order>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 404, message = "Order not found"),
+    @ApiResponse(code = 400, message = "Invalid ID supplied") })
+  @RequestMapping(value = "/order/{orderId}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.DELETE)
+  public ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted",required=true ) @PathVariable("orderId") String orderId)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
new file mode 100644
index 00000000000..4a84a38612b
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
@@ -0,0 +1,162 @@
+package io.swagger.api;
+
+import io.swagger.model.*;
+
+import io.swagger.model.User;
+import java.util.*;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.*;
+
+@Controller
+@RequestMapping(value = "/user", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/user", description = "the user API")
+public class UserApi {
+  
+
+  @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 0, message = "successful operation") })
+  @RequestMapping(value = "", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.POST)
+  public ResponseEntity<Void> createUser(@ApiParam(value = "Created user object"  ) User body)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 0, message = "successful operation") })
+  @RequestMapping(value = "/createWithArray", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.POST)
+  public ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object"  ) List<User> body)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Creates list of users with given input array", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 0, message = "successful operation") })
+  @RequestMapping(value = "/createWithList", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.POST)
+  public ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object"  ) List<User> body)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Logs user into the system", notes = "", response = String.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid username/password supplied") })
+  @RequestMapping(value = "/login", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<String> loginUser(@ApiParam(value = "The user name for login") @RequestParam("username") String username,
+    @ApiParam(value = "The password for login in clear text") @RequestParam("password") String password)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<String>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Logs out current logged in user session", notes = "", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 0, message = "successful operation") })
+  @RequestMapping(value = "/logout", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<Void> logoutUser()
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Get user by user name", notes = "", response = User.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 404, message = "User not found"),
+    @ApiResponse(code = 200, message = "successful operation"),
+    @ApiResponse(code = 400, message = "Invalid username supplied") })
+  @RequestMapping(value = "/{username}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.GET)
+  public ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing. ",required=true ) @PathVariable("username") String username)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<User>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Updated user", notes = "This can only be done by the logged in user.", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 404, message = "User not found"),
+    @ApiResponse(code = 400, message = "Invalid user supplied") })
+  @RequestMapping(value = "/{username}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.PUT)
+  public ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted",required=true ) @PathVariable("username") String username,
+    @ApiParam(value = "Updated user object"  ) User body)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+
+  @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", response = Void.class)
+  @ApiResponses(value = { 
+    @ApiResponse(code = 404, message = "User not found"),
+    @ApiResponse(code = 400, message = "Invalid username supplied") })
+  @RequestMapping(value = "/{username}", 
+    produces = { "application/json", "application/xml" }, 
+    
+    method = RequestMethod.DELETE)
+  public ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted",required=true ) @PathVariable("username") String username)
+      throws NotFoundException {
+      // do some magic!
+      return new ResponseEntity<Void>(HttpStatus.OK);
+  }
+
+  
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
new file mode 100644
index 00000000000..fb7361aa3f0
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
@@ -0,0 +1,40 @@
+package io.swagger.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.Import;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+
+@Configuration
+@ComponentScan(basePackages = "io.swagger.api")
+@EnableWebMvc
+@EnableSwagger2 //Loads the spring beans required by the framework
+@PropertySource("classpath:swagger.properties")
+@Import(SwaggerUiConfiguration.class)
+public class SwaggerConfig {
+    @Bean
+    ApiInfo apiInfo() {
+        ApiInfo apiInfo = new ApiInfo(
+        "Swagger Petstore",
+        "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
+        "1.0.0",
+        "",
+        "apiteam@wordnik.com",
+        "Apache 2.0",
+        "http://www.apache.org/licenses/LICENSE-2.0.html" );
+        return apiInfo;
+    }
+
+    @Bean
+    public Docket customImplementation(){
+        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo());
+    }
+
+}
\ No newline at end of file
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
new file mode 100644
index 00000000000..ff8f366a880
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
@@ -0,0 +1,46 @@
+package io.swagger.configuration;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+
+@Configuration
+@EnableWebMvc
+public class SwaggerUiConfiguration extends WebMvcConfigurerAdapter {
+  private static final String[] SERVLET_RESOURCE_LOCATIONS = { "/" };
+
+  private static final String[] CLASSPATH_RESOURCE_LOCATIONS = {
+      "classpath:/META-INF/resources/", "classpath:/resources/",
+      "classpath:/static/", "classpath:/public/" };
+
+  private static final String[] RESOURCE_LOCATIONS;
+  static {
+    RESOURCE_LOCATIONS = new String[CLASSPATH_RESOURCE_LOCATIONS.length
+        + SERVLET_RESOURCE_LOCATIONS.length];
+    System.arraycopy(SERVLET_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS, 0,
+        SERVLET_RESOURCE_LOCATIONS.length);
+    System.arraycopy(CLASSPATH_RESOURCE_LOCATIONS, 0, RESOURCE_LOCATIONS,
+        SERVLET_RESOURCE_LOCATIONS.length, CLASSPATH_RESOURCE_LOCATIONS.length);
+  }
+
+  private static final String[] STATIC_INDEX_HTML_RESOURCES;
+  static {
+    STATIC_INDEX_HTML_RESOURCES = new String[RESOURCE_LOCATIONS.length];
+    for (int i = 0; i < STATIC_INDEX_HTML_RESOURCES.length; i++) {
+      STATIC_INDEX_HTML_RESOURCES[i] = RESOURCE_LOCATIONS[i] + "index.html";
+    }
+  }
+
+  @Override
+  public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    if (!registry.hasMappingForPattern("/webjars/**")) {
+      registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+    if (!registry.hasMappingForPattern("/**")) {
+      registry.addResourceHandler("/**").addResourceLocations(RESOURCE_LOCATIONS);
+    }
+  }
+
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
new file mode 100644
index 00000000000..05f7dae29ec
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
@@ -0,0 +1,21 @@
+package io.swagger.configuration;
+
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
+
+public class WebApplication extends AbstractAnnotationConfigDispatcherServletInitializer {
+
+    @Override
+    protected Class<?>[] getRootConfigClasses() {
+        return new Class[] { SwaggerConfig.class };
+    }
+
+    @Override
+    protected Class<?>[] getServletConfigClasses() {
+        return new Class<?>[] { WebMvcConfiguration.class };
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        return new String[] { "/" };
+    }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
new file mode 100644
index 00000000000..206e011dd48
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
@@ -0,0 +1,11 @@
+package io.swagger.configuration;
+
+import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+public class WebMvcConfiguration extends WebMvcConfigurationSupport {
+    @Override
+    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+        configurer.enable();
+    }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
new file mode 100644
index 00000000000..98cc0b4d273
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
@@ -0,0 +1,50 @@
+package io.swagger.model;
+
+
+import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+public class Category  {
+  
+  private Long id = null;
+  private String name = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
new file mode 100644
index 00000000000..cff15e3bd2a
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
@@ -0,0 +1,111 @@
+package io.swagger.model;
+
+import java.util.Date;
+
+import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+public class Order  {
+  
+  private Long id = null;
+  private Long petId = null;
+  private Integer quantity = null;
+  private Date shipDate = null;
+  public enum StatusEnum {
+     placed,  approved,  delivered, 
+  };
+  private StatusEnum status = null;
+  private Boolean complete = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("petId")
+  public Long getPetId() {
+    return petId;
+  }
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
+  public Integer getQuantity() {
+    return quantity;
+  }
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
+  public Date getShipDate() {
+    return shipDate;
+  }
+  public void setShipDate(Date shipDate) {
+    this.shipDate = shipDate;
+  }
+
+  
+  /**
+   * Order Status
+   **/
+  @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("complete")
+  public Boolean getComplete() {
+    return complete;
+  }
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  petId: ").append(petId).append("\n");
+    sb.append("  quantity: ").append(quantity).append("\n");
+    sb.append("  shipDate: ").append(shipDate).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("  complete: ").append(complete).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
new file mode 100644
index 00000000000..e8503c6bd31
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
@@ -0,0 +1,113 @@
+package io.swagger.model;
+
+import io.swagger.model.Category;
+import io.swagger.model.Tag;
+import java.util.*;
+
+import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+public class Pet  {
+  
+  private Long id = null;
+  private Category category = null;
+  private String name = null;
+  private List<String> photoUrls = new ArrayList<String>() ;
+  private List<Tag> tags = new ArrayList<Tag>() ;
+  public enum StatusEnum {
+     available,  pending,  sold, 
+  };
+  private StatusEnum status = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("category")
+  public Category getCategory() {
+    return category;
+  }
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("tags")
+  public List<Tag> getTags() {
+    return tags;
+  }
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  
+  /**
+   * pet status in the store
+   **/
+  @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  category: ").append(category).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("  photoUrls: ").append(photoUrls).append("\n");
+    sb.append("  tags: ").append(tags).append("\n");
+    sb.append("  status: ").append(status).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
new file mode 100644
index 00000000000..d99a24f8cc1
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
@@ -0,0 +1,50 @@
+package io.swagger.model;
+
+
+import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+public class Tag  {
+  
+  private Long id = null;
+  private String name = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("name")
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  name: ").append(name).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
new file mode 100644
index 00000000000..24d707e921f
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
@@ -0,0 +1,135 @@
+package io.swagger.model;
+
+
+import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+@ApiModel(description = "")
+public class User  {
+  
+  private Long id = null;
+  private String username = null;
+  private String firstName = null;
+  private String lastName = null;
+  private String email = null;
+  private String password = null;
+  private String phone = null;
+  private Integer userStatus = null;
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("id")
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("username")
+  public String getUsername() {
+    return username;
+  }
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
+  public String getFirstName() {
+    return firstName;
+  }
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
+  public String getLastName() {
+    return lastName;
+  }
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("email")
+  public String getEmail() {
+    return email;
+  }
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("password")
+  public String getPassword() {
+    return password;
+  }
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  @JsonProperty("phone")
+  public String getPhone() {
+    return phone;
+  }
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+  
+  /**
+   * User Status
+   **/
+  @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+  
+
+  @Override
+  public String toString()  {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    
+    sb.append("  id: ").append(id).append("\n");
+    sb.append("  username: ").append(username).append("\n");
+    sb.append("  firstName: ").append(firstName).append("\n");
+    sb.append("  lastName: ").append(lastName).append("\n");
+    sb.append("  email: ").append(email).append("\n");
+    sb.append("  password: ").append(password).append("\n");
+    sb.append("  phone: ").append(phone).append("\n");
+    sb.append("  userStatus: ").append(userStatus).append("\n");
+    sb.append("}\n");
+    return sb.toString();
+  }
+}
diff --git a/samples/server/petstore/spring-mvc/src/main/resources/swagger.properties b/samples/server/petstore/spring-mvc/src/main/resources/swagger.properties
new file mode 100644
index 00000000000..fdbe5371934
--- /dev/null
+++ b/samples/server/petstore/spring-mvc/src/main/resources/swagger.properties
@@ -0,0 +1 @@
+springfox.documentation.swagger.v2.path=/api-docs
\ No newline at end of file