diff --git a/samples/client/wordnik-api/scala/pom.xml b/samples/client/wordnik-api/scala/pom.xml
index 68162889d15..4a83a05521b 100644
--- a/samples/client/wordnik-api/scala/pom.xml
+++ b/samples/client/wordnik-api/scala/pom.xml
@@ -2,10 +2,10 @@
   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>scala-client</artifactId>
   <packaging>jar</packaging>
-  <name>swagger-client</name>
-  <version>1.0</version>
+  <name>scala-client</name>
+  <version>4.0</version>
   <prerequisites>
     <maven>2.2.0</maven>
   </prerequisites>
@@ -170,13 +170,13 @@
     </dependency>
     <dependency>
       <groupId>com.wordnik</groupId>
-      <artifactId>swagger-core_2.9.1</artifactId>
+      <artifactId>swagger-core_${scala-short-version}</artifactId>
       <version>${swagger-core-version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.9.1</artifactId>
+      <artifactId>scalatest_${scala-short-version}</artifactId>
       <version>${scala-test-version}</version>
       <scope>test</scope>
     </dependency>
@@ -187,15 +187,34 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+    <profiles>
+        <profile>
+            <id>scala_2.10</id>
+            <properties>
+                <scala-version>2.10.3</scala-version>
+                <scala-short-version>2.10</scala-short-version>
+                <swagger-core-version>1.3.2</swagger-core-version>
+                <scala-test-version>2.1.2</scala-test-version>
+            </properties>
+        </profile>
+        <profile>
+            <id>scala_2.9.1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <scala-version>2.9.1-1</scala-version>
+                <scala-short-version>2.9.1</scala-short-version>
+                <swagger-core-version>1.1.0</swagger-core-version>
+                <scala-test-version>1.6.1</scala-test-version>
+            </properties>
+        </profile>
+    </profiles>
   <properties>
     <jersey-version>1.7</jersey-version>
-    <swagger-core-version>1.1.0</swagger-core-version>
-    <scala-version>2.9.1-1</scala-version>
     <junit-version>4.8.1</junit-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
-    <scala-test-version>1.6.1</scala-test-version>
     <junit-version>4.8.1</junit-version>
-    <scala-test-version>1.6.1</scala-test-version>
     <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
   </properties>
 </project>
diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/AccountApi.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/AccountApi.scala
index a5dd0901880..e42875e672a 100644
--- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/AccountApi.scala
+++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/AccountApi.scala
@@ -23,6 +23,7 @@ class AccountApi {
     val path = "/account.{format}/authenticate/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -52,6 +53,7 @@ class AccountApi {
     val path = "/account.{format}/authenticate/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}",apiInvoker.escape(username))
 
     
+
     val contentType = {
       if(body != null && body.isInstanceOf[File] )
         "multipart/form-data"
@@ -81,6 +83,7 @@ class AccountApi {
   def getWordListsForLoggedInUser (auth_token: String, skip: Int= 0, limit: Int= 50) : Option[List[WordList]]= {
     // create path and map variables
     val path = "/account.{format}/wordLists".replaceAll("\\{format\\}","json")
+
     val contentType = {
       "application/json"}
 
@@ -110,6 +113,7 @@ class AccountApi {
   def getApiTokenStatus (api_key: String) : Option[ApiTokenStatus]= {
     // create path and map variables
     val path = "/account.{format}/apiTokenStatus".replaceAll("\\{format\\}","json")
+
     val contentType = {
       "application/json"}
 
@@ -132,6 +136,7 @@ class AccountApi {
   def getLoggedInUser (auth_token: String) : Option[User]= {
     // create path and map variables
     val path = "/account.{format}/user".replaceAll("\\{format\\}","json")
+
     val contentType = {
       "application/json"}
 
diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordApi.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordApi.scala
index cab9db7e07a..f36f45d0f5e 100644
--- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordApi.scala
+++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordApi.scala
@@ -30,6 +30,7 @@ class WordApi {
     val path = "/word.{format}/{word}/examples".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -62,6 +63,7 @@ class WordApi {
     val path = "/word.{format}/{word}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -92,6 +94,7 @@ class WordApi {
     val path = "/word.{format}/{word}/definitions".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -126,6 +129,7 @@ class WordApi {
     val path = "/word.{format}/{word}/topExample".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -155,6 +159,7 @@ class WordApi {
     val path = "/word.{format}/{word}/relatedWords".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -186,6 +191,7 @@ class WordApi {
     val path = "/word.{format}/{word}/pronunciations".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -218,6 +224,7 @@ class WordApi {
     val path = "/word.{format}/{word}/hyphenation".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -249,6 +256,7 @@ class WordApi {
     val path = "/word.{format}/{word}/frequency".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -280,6 +288,7 @@ class WordApi {
     val path = "/word.{format}/{word}/phrases".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -311,6 +320,7 @@ class WordApi {
     val path = "/word.{format}/{word}/etymologies".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -340,6 +350,7 @@ class WordApi {
     val path = "/word.{format}/{word}/audio".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -370,6 +381,7 @@ class WordApi {
     val path = "/word.{format}/{word}/scrabbleScore".replaceAll("\\{format\\}","json").replaceAll("\\{" + "word" + "\\}",apiInvoker.escape(word))
 
     
+
     val contentType = {
       "application/json"}
 
diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListApi.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListApi.scala
index bc4124f6c2a..a8c4e955c9a 100644
--- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListApi.scala
+++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListApi.scala
@@ -22,6 +22,7 @@ class WordListApi {
     val path = "/wordList.{format}/{permalink}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}",apiInvoker.escape(permalink))
 
     
+
     val contentType = {
       if(body != null && body.isInstanceOf[File] )
         "multipart/form-data"
@@ -53,6 +54,7 @@ class WordListApi {
     val path = "/wordList.{format}/{permalink}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}",apiInvoker.escape(permalink))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -81,6 +83,7 @@ class WordListApi {
     val path = "/wordList.{format}/{permalink}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}",apiInvoker.escape(permalink))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -110,6 +113,7 @@ class WordListApi {
     val path = "/wordList.{format}/{permalink}/words".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}",apiInvoker.escape(permalink))
 
     
+
     val contentType = {
       if(body != null && body.isInstanceOf[File] )
         "multipart/form-data"
@@ -141,6 +145,7 @@ class WordListApi {
     val path = "/wordList.{format}/{permalink}/words".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}",apiInvoker.escape(permalink))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -174,6 +179,7 @@ class WordListApi {
     val path = "/wordList.{format}/{permalink}/deleteWords".replaceAll("\\{format\\}","json").replaceAll("\\{" + "permalink" + "\\}",apiInvoker.escape(permalink))
 
     
+
     val contentType = {
       if(body != null && body.isInstanceOf[File] )
         "multipart/form-data"
diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListsApi.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListsApi.scala
index cd854997b61..b796004447d 100644
--- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListsApi.scala
+++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordListsApi.scala
@@ -18,6 +18,7 @@ class WordListsApi {
   def createWordList (body: WordList, auth_token: String) : Option[WordList]= {
     // create path and map variables
     val path = "/wordLists.{format}".replaceAll("\\{format\\}","json")
+
     val contentType = {
       if(body != null && body.isInstanceOf[File] )
         "multipart/form-data"
diff --git a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordsApi.scala b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordsApi.scala
index a5b96d4f3f2..7d37f844b27 100644
--- a/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordsApi.scala
+++ b/samples/client/wordnik-api/scala/src/main/scala/com/wordnik/client/api/WordsApi.scala
@@ -23,6 +23,7 @@ class WordsApi {
     val path = "/words.{format}/search/{query}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "query" + "\\}",apiInvoker.escape(query))
 
     
+
     val contentType = {
       "application/json"}
 
@@ -60,6 +61,7 @@ class WordsApi {
   def getWordOfTheDay (date: String) : Option[WordOfTheDay]= {
     // create path and map variables
     val path = "/words.{format}/wordOfTheDay".replaceAll("\\{format\\}","json")
+
     val contentType = {
       "application/json"}
 
@@ -82,6 +84,7 @@ class WordsApi {
   def reverseDictionary (query: String, findSenseForWord: String, includeSourceDictionaries: String, excludeSourceDictionaries: String, includePartOfSpeech: String, excludePartOfSpeech: String, expandTerms: String, sortBy: String, sortOrder: String, minCorpusCount: Int= 5, maxCorpusCount: Int= -1, minLength: Int= 1, maxLength: Int= -1, includeTags: String= "false", skip: String= "0", limit: Int= 10) : Option[DefinitionSearchResults]= {
     // create path and map variables
     val path = "/words.{format}/reverseDictionary".replaceAll("\\{format\\}","json")
+
     val contentType = {
       "application/json"}
 
@@ -124,6 +127,7 @@ class WordsApi {
   def getRandomWords (includePartOfSpeech: String, excludePartOfSpeech: String, sortBy: String, sortOrder: String, hasDictionaryDef: String= "true", minCorpusCount: Int= 0, maxCorpusCount: Int= -1, minDictionaryCount: Int= 1, maxDictionaryCount: Int= -1, minLength: Int= 5, maxLength: Int= -1, limit: Int= 10) : Option[List[WordObject]]= {
     // create path and map variables
     val path = "/words.{format}/randomWords".replaceAll("\\{format\\}","json")
+
     val contentType = {
       "application/json"}
 
@@ -157,6 +161,7 @@ class WordsApi {
   def getRandomWord (includePartOfSpeech: String, excludePartOfSpeech: String, hasDictionaryDef: String= "true", minCorpusCount: Int= 0, maxCorpusCount: Int= -1, minDictionaryCount: Int= 1, maxDictionaryCount: Int= -1, minLength: Int= 5, maxLength: Int= -1) : Option[WordObject]= {
     // create path and map variables
     val path = "/words.{format}/randomWord".replaceAll("\\{format\\}","json")
+
     val contentType = {
       "application/json"}