diff --git a/dist/lib/swagger-client.js b/dist/lib/swagger-client.js
index c6498f12..735fc2a8 100644
--- a/dist/lib/swagger-client.js
+++ b/dist/lib/swagger-client.js
@@ -1152,6 +1152,8 @@ getStringSignature = function(obj) {
     str += 'integer';
   else if(obj.type === 'integer' && obj.format === 'int64')
     str += 'long';
+  else if(obj.type === 'integer' && typeof obj.format === 'undefined')
+    str += 'long';
   else if(obj.type === 'string' && obj.format === 'date-time')
     str += 'date-time';
   else if(obj.type === 'string' && obj.format === 'date')
@@ -1160,6 +1162,8 @@ getStringSignature = function(obj) {
     str += 'float';
   else if(obj.type === 'number' && obj.format === 'double')
     str += 'double';
+  else if(obj.type === 'number' && typeof obj.format === 'undefined')
+    str += 'double';
   else if(obj.type === 'boolean')
     str += 'boolean';
   else
@@ -1193,6 +1197,8 @@ typeFromJsonSchema = function(type, format) {
     str = 'integer';
   else if(type === 'integer' && format === 'int64')
     str = 'long';
+  else if(type === 'integer' && typeof format === 'undefined')
+    str = 'long';
   else if(type === 'string' && format === 'date-time')
     str = 'date-time';
   else if(type === 'string' && format === 'date')
@@ -1201,6 +1207,8 @@ typeFromJsonSchema = function(type, format) {
     str = 'float';
   else if(type === 'number' && format === 'double')
     str = 'double';
+  else if(type === 'number' && typeof format === 'undefined')
+    str = 'double';
   else if(type === 'boolean')
     str = 'boolean';
   else if(type === 'string')
diff --git a/lib/swagger-client.js b/lib/swagger-client.js
index c6498f12..735fc2a8 100644
--- a/lib/swagger-client.js
+++ b/lib/swagger-client.js
@@ -1152,6 +1152,8 @@ getStringSignature = function(obj) {
     str += 'integer';
   else if(obj.type === 'integer' && obj.format === 'int64')
     str += 'long';
+  else if(obj.type === 'integer' && typeof obj.format === 'undefined')
+    str += 'long';
   else if(obj.type === 'string' && obj.format === 'date-time')
     str += 'date-time';
   else if(obj.type === 'string' && obj.format === 'date')
@@ -1160,6 +1162,8 @@ getStringSignature = function(obj) {
     str += 'float';
   else if(obj.type === 'number' && obj.format === 'double')
     str += 'double';
+  else if(obj.type === 'number' && typeof obj.format === 'undefined')
+    str += 'double';
   else if(obj.type === 'boolean')
     str += 'boolean';
   else
@@ -1193,6 +1197,8 @@ typeFromJsonSchema = function(type, format) {
     str = 'integer';
   else if(type === 'integer' && format === 'int64')
     str = 'long';
+  else if(type === 'integer' && typeof format === 'undefined')
+    str = 'long';
   else if(type === 'string' && format === 'date-time')
     str = 'date-time';
   else if(type === 'string' && format === 'date')
@@ -1201,6 +1207,8 @@ typeFromJsonSchema = function(type, format) {
     str = 'float';
   else if(type === 'number' && format === 'double')
     str = 'double';
+  else if(type === 'number' && typeof format === 'undefined')
+    str = 'double';
   else if(type === 'boolean')
     str = 'boolean';
   else if(type === 'string')