@@ -125,11 +125,18 @@ +(NSString*)contentTypeForRequestString:(NSString*)requestString
     return [NSString stringWithFormat:@"%@; charset=%@", contentType, charset];
 }
 
-+(NSString*)urlEncode:(NSString*)string
++(NSString*)urlEncode:(id<NSObject>)value
 {
+    //make sure param is a string
+    if ([value isKindOfClass:[NSNumber class]]) {
+        value = [(NSNumber*)value stringValue];
+    }
+    
+    NSAssert([value isKindOfClass:[NSString class]], @"request parameters can be only of NSString or NSNumber classes. '%@' is of class %@.", value, [value class]);
+        
     return (NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(
                                                                                  NULL,
-                                                                                 (__bridge CFStringRef) string,
+                                                                                 (__bridge CFStringRef) value,
                                                                                  NULL,
                                                                                  (CFStringRef)@"!*'();:@&=+$,/?%#[]",
                                                                                  kCFStringEncodingUTF8));
 
@@ -338,5 +338,37 @@ -(void)testPostJSONWithError
     [[MTTestSemaphor semaphore] waitForKey: semaphorKey];
 }
 
+//https://github.com/icanzilb/JSONModel/issues/58
+-(void)testNumberQueryParams
+{
+    NSString* jsonURLString = @"http://localhost/test.json?testGetJSONFromURLWithParamsNumber";
+    NSString* semaphorKey = @"testGetJSONFromURLWithParamsNumber";
+    
+    NSHTTPURLResponse* response = [[NSHTTPURLResponse alloc] initWithURL:[NSURL URLWithString:jsonURLString]
+                                                              statusCode:200
+                                                             HTTPVersion:@"1.1"
+                                                            headerFields:nil];
+    
+    [NSURLConnection setNextResponse:response data:[jsonContents dataUsingEncoding:NSUTF8StringEncoding] error:nil];
+    
+    [JSONHTTPClient getJSONFromURLWithString:jsonURLString
+                                      params:@{@"key1":@100.56,@"key2":@"test"}
+                                  completion:^(NSDictionary *json, JSONModelError *err) {
+                                      
+                                      //check block parameters
+                                      NSAssert(json, @"getJSONFromURLWithString:completion: returned nil, object expected");
+                                      NSAssert(!err, @"getJSONFromURLWithString:completion: returned error, nil error expected");
+                                      
+                                      //check the request
+                                      NSURLRequest* request = [NSURLConnection lastRequest];
+                                      NSAssert([request.URL.absoluteString isEqualToString: @"http://localhost/test.json?testGetJSONFromURLWithParamsNumber&key1=100.56&key2=test"], @"request.URL did not match the request URL");
+                                      
+                                      //release the semaphore lock
+                                      [[MTTestSemaphor semaphore] lift: semaphorKey];
+                                  }];
+    
+    [[MTTestSemaphor semaphore] waitForKey: semaphorKey];
+
+}
 
 @end