diff --git a/README.md b/README.md
index ef65765..20b9785 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-**The current version of this library does not yet support socket.io v1.0.  
-So if you want to use socket.io-objc, please fall back to v0.9.x.**
+**This fork supports some socket.io v1.0 features, (no binary support yet). Many thanks to francoisTemasys who did most of the heavy lifting; this is a fork of a fork. v0.9.x compatibility is generally maintained.
+
 
 ---
 
diff --git a/SocketIO.h b/SocketIO.h
index 2fbb12e..67ceb23 100755
--- a/SocketIO.h
+++ b/SocketIO.h
@@ -21,6 +21,7 @@
 #import <Foundation/Foundation.h>
 
 #import "SocketIOTransport.h"
+#import "SocketIOPacket.h"
 
 @class SocketIO;
 @class SocketIOPacket;
@@ -41,6 +42,7 @@ typedef enum {
 } SocketIOErrorCodes;
 
 
+
 @protocol SocketIODelegate <NSObject>
 @optional
 - (void) socketIODidConnect:(SocketIO *)socket;
@@ -61,6 +63,8 @@ typedef enum {
     NSString *_endpoint;
     NSDictionary *_params;
     
+    SocketIOVersion _version;    
+    
     __weak id<SocketIODelegate> _delegate;
     
     NSObject <SocketIOTransport> *_transport;
@@ -75,7 +79,9 @@ typedef enum {
     
     // heartbeat
     NSTimeInterval _heartbeatTimeout;
+    NSTimeInterval _connectionTimeout;
     dispatch_source_t _timeout;
+    dispatch_source_t _heartbeat;
     
     NSMutableArray *_queue;
     
diff --git a/SocketIO.m b/SocketIO.m
index 61ff67a..6cfc636 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -37,7 +37,9 @@
 #endif
 
 static NSString* kResourceName = @"socket.io";
-static NSString* kHandshakeURL = @"%@://%@%@/%@/1/?t=%.0f%@";
+static NSString* kTransportPolling = @"polling";
+static NSString* kTransportWebsocket = @"websocket";
+static NSString* kHandshakeURL = @"%@://%@%@/%@/1/?EIO=2&transport=%@&t=%.0f%@";
 static NSString* kForceDisconnectURL = @"%@://%@%@/%@/1/xhr-polling/%@?disconnect";
 
 float const defaultConnectionTimeout = 10.0f;
@@ -55,11 +57,10 @@ - (NSArray*) arrayOfCaptureComponentsMatchedByRegex:(NSString*)regex;
 - (void) setTimeout;
 - (void) onTimeout;
 
+- (void) sendHeartbeat;
 - (void) onConnect:(SocketIOPacket *)packet;
 - (void) onDisconnect:(NSError *)error;
-
 - (void) sendDisconnect;
-- (void) sendHearbeat;
 - (void) send:(SocketIOPacket *)packet;
 
 - (NSString *) addAcknowledge:(SocketIOCallback)function;
@@ -136,7 +137,9 @@ - (void) connectToHost:(NSString *)host
         NSString *protocol = _useSecure ? @"https" : @"http";
         NSString *port = _port ? [NSString stringWithFormat:@":%d", _port] : @"";
         NSTimeInterval time = [[NSDate date] timeIntervalSince1970] * 1000;
-        NSString *handshakeUrl = [NSString stringWithFormat:kHandshakeURL, protocol, _host, port, kResourceName, time, query];
+        NSString *handshakeUrl = [NSString stringWithFormat:kHandshakeURL, protocol, _host, port, kResourceName,kTransportPolling, time, query];
+        //@"%@://%@%@/%@/1/?t=%.0f%@";
+        //http://<host><port>/socket.io/1/?t=<time>f<query>
         
         DEBUGLOG(@"Connecting to socket with URL: %@", handshakeUrl);
         query = nil;
@@ -207,10 +210,20 @@ - (void) sendMessage:(NSString *)data
 
 - (void) sendMessage:(NSString *)data withAcknowledge:(SocketIOCallback)function
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"message"];
-    packet.data = data;
-    packet.pId = [self addAcknowledge:function];
-    [self send:packet];
+    switch (_version)
+    {
+        case V09x:
+        {
+            SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"message"];
+            packet.data = data;
+            packet.pId = [self addAcknowledge:function];
+            [self send:packet];
+        }break;
+        case V10x:
+        {
+            [self sendEvent:@"message" withData:data];
+        }break;
+    }
 }
 
 - (void) sendJSON:(NSDictionary *)data
@@ -220,10 +233,20 @@ - (void) sendJSON:(NSDictionary *)data
 
 - (void) sendJSON:(NSDictionary *)data withAcknowledge:(SocketIOCallback)function
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"json"];
-    packet.data = [SocketIOJSONSerialization JSONStringFromObject:data error:nil];
-    packet.pId = [self addAcknowledge:function];
-    [self send:packet];
+    switch (_version)
+    {
+        case V09x:
+        {
+            SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"json"];
+            packet.data = [SocketIOJSONSerialization JSONStringFromObject:data error:nil];
+            packet.pId = [self addAcknowledge:function];
+            [self send:packet];
+        }break;
+        case V10x:
+        {
+            [self sendEvent:@"message" withData:data andAcknowledge:function];
+        }break;
+    }
 }
 
 - (void) sendEvent:(NSString *)eventName withData:(id)data
@@ -233,15 +256,37 @@ - (void) sendEvent:(NSString *)eventName withData:(id)data
 
 - (void) sendEvent:(NSString *)eventName withData:(id)data andAcknowledge:(SocketIOCallback)function
 {
-    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:eventName forKey:@"name"];
-
-    // do not require arguments
-    if (data != nil) {
-        [dict setObject:[NSArray arrayWithObject:data] forKey:@"args"];
+    SocketIOPacket *packet ;
+    switch (_version) {
+        case V10x:
+        {
+            packet = [[SocketIOPacketV10x alloc] initWithType:@"event"];
+            NSMutableArray *array = [NSMutableArray arrayWithObjects:eventName, nil];
+            
+            // do not require arguments
+            if (data != nil)
+            {
+                [array addObject:data];
+            }
+            packet.data = [SocketIOJSONSerialization JSONStringFromObject:array error:nil];
+            //packet.data = [packet.data stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
+        }break;
+            
+        case V09x:
+        {
+            packet = [[SocketIOPacket alloc] initWithType:@"event"];
+            NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObject:eventName forKey:@"name"];
+            
+            // do not require arguments
+            if (data != nil)
+            {
+                [dict setObject:[NSArray arrayWithObject:data] forKey:@"args"];
+            }
+            packet.data = [SocketIOJSONSerialization JSONStringFromObject:dict error:nil];
+        }break;
     }
     
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"event"];
-    packet.data = [SocketIOJSONSerialization JSONStringFromObject:dict error:nil];
+    packet.name =eventName;
     packet.pId = [self addAcknowledge:function];
     if (function) {
         packet.ack = @"data";
@@ -269,20 +314,20 @@ - (void) setResourceName:(NSString *)name
 
 - (void) sendDisconnect
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"disconnect"];
+    SocketIOPacket *packet = [SocketIOPacket createPacketWithType:@"disconnect" version:_version];
     [self send:packet];
     [self onDisconnect:nil];
 }
 
 - (void) sendConnect
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"connect"];
+    SocketIOPacket *packet = [SocketIOPacket createPacketWithType:@"connect" version:_version];
     [self send:packet];
 }
 
 - (void) sendHeartbeat
 {
-    SocketIOPacket *packet = [[SocketIOPacket alloc] initWithType:@"heartbeat"];
+    SocketIOPacket *packet = [SocketIOPacket createPacketWithType:@"heartbeat" version:_version];
     [self send:packet];
 }
 
@@ -292,39 +337,10 @@ - (void) send:(SocketIOPacket *)packet
         DEBUGLOG(@"Already disconnected!");
         return;
     }
-    DEBUGLOG(@"send()");
-    NSNumber *type = [packet typeAsNumber];
-    NSMutableArray *encoded = [NSMutableArray arrayWithObject:type];
-    
-    NSString *pId = packet.pId != nil ? packet.pId : @"";
-    if ([packet.ack isEqualToString:@"data"]) {
-        pId = [pId stringByAppendingString:@"+"];
-    }
-    
-    // Do not write pid for acknowledgements
-    if ([type intValue] != 6) {
-        [encoded addObject:pId];
-    }
-    
-    // Add the end point for the namespace to be used, as long as it is not
-    // an ACK, heartbeat, or disconnect packet
-    if ([type intValue] != 6 && [type intValue] != 2 && [type intValue] != 0) {
-        [encoded addObject:_endpoint];
-    } 
-    else {
-        [encoded addObject:@""];
-    }
+    DEBUGLOG(@"Prepare to send()");
     
-    if (packet.data != nil) {
-        NSString *ackpId = @"";
-        // This is an acknowledgement packet, so, prepend the ack pid to the data
-        if ([type intValue] == 6) {
-            ackpId = [NSString stringWithFormat:@":%@%@", packet.pId, @"+"];
-        }
-        [encoded addObject:[NSString stringWithFormat:@"%@%@", ackpId, packet.data]];
-    }
     
-    NSString *req = [encoded componentsJoinedByString:@":"];
+    NSString *req = [packet toString];
     if (![_transport isReady]) {
         DEBUGLOG(@"queue >>> %@", req);
         [_queue addObject:packet];
@@ -376,7 +392,6 @@ - (void) onConnect:(SocketIOPacket *)packet
     
     // send any queued packets
     [self doQueue];
-    
     [self setTimeout];
 }
 
@@ -417,7 +432,7 @@ - (void) onTimeout
 
 - (void) setTimeout 
 {
-    DEBUGLOG(@"start/reset timeout");
+    //DEBUGLOG(@"start/reset timeout");
     if (_timeout) {
         dispatch_source_cancel(_timeout);
         _timeout = NULL;
@@ -429,7 +444,7 @@ - (void) setTimeout
                                       dispatch_get_main_queue());
     
     dispatch_source_set_timer(_timeout,
-                              dispatch_time(DISPATCH_TIME_NOW, _heartbeatTimeout * NSEC_PER_SEC),
+                              dispatch_time(DISPATCH_TIME_NOW, _connectionTimeout * NSEC_PER_SEC),
                               0,
                               0);
     
@@ -439,8 +454,40 @@ - (void) setTimeout
         [weakSelf onTimeout];
     });
     
-    dispatch_resume(_timeout);
+    dispatch_resume(_timeout);    
+}
+
+- (void) onHeartBeat
+{
+    [self sendHeartbeat];
+}
+
+- (void) setHeartBeat
+{
+    DEBUGLOG(@"start/reset Heartbeat");
+    if (_heartbeat)
+    {
+        dispatch_source_cancel(_heartbeat);
+        _heartbeat = NULL;
+    }
+    
+    _heartbeat = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER,
+                                      0,
+                                      0,
+                                      dispatch_get_main_queue());
+    
+    dispatch_source_set_timer(_heartbeat,
+                              dispatch_time(DISPATCH_TIME_NOW, DISPATCH_TIME_NOW),
+                              _heartbeatTimeout * NSEC_PER_SEC,
+                              0);
     
+    __weak SocketIO *weakSelf = self;
+    
+    dispatch_source_set_event_handler(_heartbeat, ^{
+        [weakSelf onHeartBeat];
+    });
+    
+    dispatch_resume(_heartbeat);
 }
 
 
@@ -483,128 +530,288 @@ - (void) onData:(NSString *)data
     [self setTimeout];
     
     // check if data is valid (from socket.io.js)
-    NSString *regex = @"^([^:]+):([0-9]+)?(\\+)?:([^:]+)?:?(.*)?$";
-    NSString *regexPieces = @"^([0-9]+)(\\+)?(.*)";
-    
-    // create regex result
-    NSMutableArray *test = [self getMatchesFrom:data with:regex];
-    
-    // valid data-string arrived
-    if ([test count] > 0) {
-        NSArray *result = [test objectAtIndex:0];
-        
-        int idx = [[result objectAtIndex:1] intValue];
-        SocketIOPacket *packet = [[SocketIOPacket alloc] initWithTypeIndex:idx];
-        
-        packet.pId = [result objectAtIndex:2];
-        
-        packet.ack = [result objectAtIndex:3];
-        packet.endpoint = [result objectAtIndex:4];
-        packet.data = [result objectAtIndex:5];
-        
-        //
-        switch (idx) {
-            case 0: {
-                DEBUGLOG(@"disconnect");
-                [self onDisconnect:[NSError errorWithDomain:SocketIOError
-                                                       code:SocketIOServerRespondedWithDisconnect
-                                                   userInfo:nil]];
-                break;
-            }
-            case 1: {
-                DEBUGLOG(@"connected");
-                // from socket.io.js ... not sure when data will contain sth?!
-                // packet.qs = data || '';
-                [self onConnect:packet];
-                break;
-            }
-            case 2: {
-                DEBUGLOG(@"heartbeat");
-                [self sendHeartbeat];
-                break;
-            }
-            case 3: {
-                DEBUGLOG(@"message");
-                if (packet.data && ![packet.data isEqualToString:@""]) {
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
-                        [_delegate socketIO:self didReceiveMessage:packet];
+    switch(_version)
+    {
+        case V09x:
+        {
+            NSString *regex = @"^([^:]+):([0-9]+)?(\\+)?:([^:]+)?:?(.*)?$";
+            NSString *regexPieces = @"^([0-9]+)(\\+)?(.*)";
+            
+            // create regex result
+            NSMutableArray *test = [self getMatchesFrom:data with:regex];
+            
+            // valid data-string arrived
+            if ([test count] > 0) {
+                NSArray *result = [test objectAtIndex:0];
+                
+                int idx = [[result objectAtIndex:1] intValue];
+                SocketIOPacket *packet = [[SocketIOPacket alloc] initWithTypeIndex:idx];
+                
+                packet.pId = [result objectAtIndex:2];
+                
+                packet.ack = [result objectAtIndex:3];
+                packet.endpoint = [result objectAtIndex:4];
+                packet.data = [result objectAtIndex:5];
+                
+                //
+                switch (idx)
+                {
+                    case 0: {
+                        DEBUGLOG(@"disconnect");
+                        [self onDisconnect:[NSError errorWithDomain:SocketIOError
+                                                               code:SocketIOServerRespondedWithDisconnect
+                                                           userInfo:nil]];
+                        break;
                     }
-                }
-                break;
-            }
-            case 4: {
-                DEBUGLOG(@"json");
-                if (packet.data && ![packet.data isEqualToString:@""]) {
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveJSON:)]) {
-                        [_delegate socketIO:self didReceiveJSON:packet];
+                    case 1: {
+                        DEBUGLOG(@"connected");
+                        // from socket.io.js ... not sure when data will contain sth?!
+                        // packet.qs = data || '';
+                        [self onConnect:packet];
+                        break;
                     }
-                }
-                break;
-            }
-            case 5: {
-                DEBUGLOG(@"event");
-                if (packet.data && ![packet.data isEqualToString:@""]) {
-                    NSDictionary *json = [packet dataAsJSON];
-                    packet.name = [json objectForKey:@"name"];
-                    packet.args = [json objectForKey:@"args"];
-                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {
-                        [_delegate socketIO:self didReceiveEvent:packet];
+                    case 2: {
+                        DEBUGLOG(@"heartbeat");
+                        [self sendHeartbeat];
+                        break;
                     }
-                }
-                break;
-            }
-            case 6: {
-                DEBUGLOG(@"ack");
-                
-                // create regex result
-                NSMutableArray *pieces = [self getMatchesFrom:packet.data with:regexPieces];
-                
-                if ([pieces count] > 0) {
-                    NSArray *piece = [pieces objectAtIndex:0];
-                    int ackId = [[piece objectAtIndex:1] intValue];
-                    DEBUGLOG(@"ack id found: %d", ackId);
-                    
-                    NSString *argsStr = [piece objectAtIndex:3];
-                    id argsData = nil;
-                    if (argsStr && ![argsStr isEqualToString:@""]) {
-                        argsData = [SocketIOJSONSerialization objectFromJSONData:[argsStr dataUsingEncoding:NSUTF8StringEncoding] error:nil];
-                        // either send complete response or only the first arg to callback
-                        if (!_returnAllDataFromAck && [argsData count] > 0) {
-                            argsData = [argsData objectAtIndex:0];
+                    case 3: {
+                        DEBUGLOG(@"message");
+                        if (packet.data && ![packet.data isEqualToString:@""]) {
+                            if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
+                                [_delegate socketIO:self didReceiveMessage:packet];
+                            }
                         }
+                        break;
                     }
-                    
-                    // get selector for ackId
-                    NSString *key = [NSString stringWithFormat:@"%d", ackId];
-                    SocketIOCallback callbackFunction = [_acks objectForKey:key];
-                    if (callbackFunction != nil) {
-                        callbackFunction(argsData);
-                        [self removeAcknowledgeForKey:key];
+                    case 4: {
+                        DEBUGLOG(@"json");
+                        if (packet.data && ![packet.data isEqualToString:@""]) {
+                            if ([_delegate respondsToSelector:@selector(socketIO:didReceiveJSON:)]) {
+                                [_delegate socketIO:self didReceiveJSON:packet];
+                            }
+                        }
+                        break;
+                    }
+                    case 5: {
+                        DEBUGLOG(@"event");
+                        if (packet.data && ![packet.data isEqualToString:@""]) {
+                            NSDictionary *json = [packet dataAsJSON];
+                            packet.name = [json objectForKey:@"name"];
+                            packet.args = [json objectForKey:@"args"];
+                            if ([_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {
+                                [_delegate socketIO:self didReceiveEvent:packet];
+                            }
+                        }
+                        break;
+                    }
+                    case 6: {
+                        DEBUGLOG(@"ack");
+                        
+                        // create regex result
+                        NSMutableArray *pieces = [self getMatchesFrom:packet.data with:regexPieces];
+                        
+                        if ([pieces count] > 0) {
+                            NSArray *piece = [pieces objectAtIndex:0];
+                            int ackId = [[piece objectAtIndex:1] intValue];
+                            DEBUGLOG(@"ack id found: %d", ackId);
+                            
+                            NSString *argsStr = [piece objectAtIndex:3];
+                            id argsData = nil;
+                            if (argsStr && ![argsStr isEqualToString:@""]) {
+                                argsData = [SocketIOJSONSerialization objectFromJSONData:[argsStr dataUsingEncoding:NSUTF8StringEncoding] error:nil];
+                                // either send complete response or only the first arg to callback
+                                if (!_returnAllDataFromAck && [argsData count] > 0) {
+                                    argsData = [argsData objectAtIndex:0];
+                                }
+                            }
+                            
+                            // get selector for ackId
+                            NSString *key = [NSString stringWithFormat:@"%d", ackId];
+                            SocketIOCallback callbackFunction = [_acks objectForKey:key];
+                            if (callbackFunction != nil) {
+                                callbackFunction(argsData);
+                                [self removeAcknowledgeForKey:key];
+                            }
+                        }
+                        
+                        break;
+                    }
+                    case 7: {
+                        DEBUGLOG(@"error");
+                        break;
+                    }
+                    case 8: {
+                        DEBUGLOG(@"noop");
+                        break;
+                    }
+                    default: {
+                        DEBUGLOG(@"command not found or not yet supported");
+                        break;
                     }
                 }
                 
-                break;
+                packet = nil;
             }
-            case 7: {
-                DEBUGLOG(@"error");
-                break;
-            }
-            case 8: {
-                DEBUGLOG(@"noop");
-                break;
+            else {
+                DEBUGLOG(@"ERROR: data that has arrived wasn't valid");
             }
-            default: {
-                DEBUGLOG(@"command not found or not yet supported");
-                break;
+        }break;
+        case V10x:
+        {
+            //42<NAMESPACE>["<event>","{}"]
+            //GET VERSION
+            NSUInteger control = [[NSNumber numberWithUnsignedChar:[data characterAtIndex:0]] integerValue]
+                                    -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
+            
+            NSUInteger ack = 0;
+            
+            SocketIOPacket *packet = [[SocketIOPacketV10x alloc] initWithTypeIndex:control];            
+            
+            //dont care about the endpoint here
+            packet.endpoint = @"";
+            
+            //GET GETDATA
+            if(data.length>1)
+                packet.data = [data substringFromIndex:1];
+            else
+                packet.data = @"";
+            
+            switch (control)
+            {
+                case 0:
+                    //??
+                    break;
+                case 1:
+                    //??
+                    break;
+                case 2:
+                {
+                    //Ping->Pong
+                    [self sendMessage:[NSString stringWithFormat:@"3:%@", data]];
+                }    break;
+                case 3:
+                    //Pong
+                    if([data isEqualToString:@"probe"])
+                        [self sendMessage:@"5"];
+                    break;
+                case 4:
+                {
+                    //Message
+                    control = [[NSNumber numberWithUnsignedChar:[packet.data characterAtIndex:0]] integerValue]
+                                                    -[[NSNumber numberWithUnsignedChar:'0'] integerValue];
+                    if([packet.data length] > 1){
+                        NSRange range = NSMakeRange(1, [packet.data rangeOfString:@"["].location-1);
+                        NSString *ackStr = [packet.data substringWithRange:range];
+                        ack = [ackStr integerValue];
+                    }
+                    //GET ENDPOINT
+                    NSUInteger rendpoint = [packet.data rangeOfString:@"["].location;
+                    if(rendpoint == NSNotFound)
+                        packet.endpoint = @"";
+                    else
+                        packet.endpoint = [packet.data substringToIndex:rendpoint];
+                    
+                    //GET GETDATA
+                    if(rendpoint == NSNotFound)
+                        packet.data = @"";
+                    else
+                        packet.data = [packet.data substringFromIndex:rendpoint];
+                    
+                    switch (control) {
+                        case 0:
+                            //Connected
+                            [self onConnect:packet];
+                            break;
+                        case 1:
+                            //Disconnected
+                            [self onDisconnect:[NSError errorWithDomain:SocketIOError
+                                                                   code:SocketIOServerRespondedWithDisconnect
+                                                               userInfo:nil]];
+                            break;
+                        case 2:
+                        {
+                            //Event
+                            if([packet.data characterAtIndex:0] == '[' && [packet.data characterAtIndex:packet.data.length-1] == ']')
+                            {
+                                NSData *utf8Data = [packet.data dataUsingEncoding:NSUTF8StringEncoding];
+                                NSArray *parsedData = [SocketIOJSONSerialization objectFromJSONData:utf8Data error:nil];
+                                DEBUGLOG(@"Event Type:%@",parsedData[0]);
+                                packet.name = parsedData[0];
+                                packet.args = [parsedData subarrayWithRange:NSMakeRange(1, parsedData.count-1)];
+                                if([packet.name isEqualToString:@"message"])
+                                {
+                                    packet.data = packet.args[0];
+                                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveMessage:)]) {
+                                        [_delegate socketIO:self didReceiveMessage:packet];
+                                    }
+                                }
+                                else
+                                {
+                                    if ([_delegate respondsToSelector:@selector(socketIO:didReceiveEvent:)]) {
+                                        [_delegate socketIO:self didReceiveEvent:packet];
+                                    }
+                                }
+                                
+                            }
+                        }    break;
+                        case 3:
+                        {
+                            
+                            if (ack > 0) {
+                                int ackId = ack;
+                                DEBUGLOG(@"ack id found: %d", ackId);
+                                
+                                NSString *argsStr = [packet.data substringFromIndex:1 ];
+                                argsStr = [argsStr substringToIndex:argsStr.length-1];
+                                id argsData = nil;
+                                if (argsStr && ![argsStr isEqualToString:@""]) {
+                                    argsData = [SocketIOJSONSerialization objectFromJSONData:[argsStr dataUsingEncoding:NSUTF8StringEncoding] error:nil];
+                                    // either send complete response or only the first arg to callback
+//                                    if (!_returnAllDataFromAck && [argsData count] > 0) {
+//                                        argsData = [argsData objectAtIndex:0];
+//                                    }
+                                }
+                                
+                                // get selector for ackId
+                                NSString *key = [NSString stringWithFormat:@"%d", ackId];
+                                SocketIOCallback callbackFunction = [_acks objectForKey:key];
+                                if (callbackFunction != nil) {
+                                    callbackFunction(argsData);
+                                    [self removeAcknowledgeForKey:key];
+                                }
+                            }
+
+                        }    break;
+                        case 4:
+                            //Error
+                            break;
+                        case 5:
+                            //Binary Event
+                            break;
+                        case 6:
+                            //Binary Ack
+                            break;
+                            
+                        default:
+                            break;
+                    }
+                    
+                }    break;
+                case 5:
+                    //Upgrade Required
+                    break;
+                case 6:
+                    //Noop
+                    break;
+                    
+                default:
+                    break;
             }
-        }
-        
-        packet = nil;
+            
+        }break;
     }
-    else {
-        DEBUGLOG(@"ERROR: data that has arrived wasn't valid");
     }
-}
 
 - (void) onDisconnect:(NSError *)error
 {
@@ -619,6 +826,10 @@ - (void) onDisconnect:(NSError *)error
     [_queue removeAllObjects];
     
     // Kill the heartbeat timer
+    if (_heartbeat) {
+        dispatch_source_cancel(_heartbeat);
+        _heartbeat = NULL;
+    }
     if (_timeout) {
         dispatch_source_cancel(_timeout);
         _timeout = NULL;
@@ -702,77 +913,150 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
 { 	
  	NSString *responseString = [[NSString alloc] initWithData:_httpRequestData encoding:NSASCIIStringEncoding];
 
-    DEBUGLOG(@"connectionDidFinishLoading() %@", responseString);
-    NSArray *data = [responseString componentsSeparatedByString:@":"];
-    // should be SID : heartbeat timeout : connection timeout : supported transports
-    
-    // check each returned value (thanks for the input https://github.com/taiyangc)
+    DEBUGLOG(@"connectionDidFinishLoading()");
+    NSString *responseV09Regex = @"([^:]+):([^:]+):([^:]+):([^:]+)";
+    NSPredicate *version09predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", responseV09Regex];
+
     BOOL connectionFailed = false;
     NSError* error;
     
-    _sid = [data objectAtIndex:0];
-    if ([_sid length] < 1 || [data count] < 4) {
-        // did not receive valid data, possibly missing a useSecure?
-        connectionFailed = true;
-    }
-    else {
-        // check SID
-        DEBUGLOG(@"sid: %@", _sid);
-        NSString *regex = @"[^0-9]";
-        NSPredicate *regexTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex];
-        if ([_sid rangeOfString:@"error"].location != NSNotFound || [regexTest evaluateWithObject:_sid]) {
-            [self connectToHost:_host onPort:_port withParams:_params withNamespace:_endpoint];
-            return;
-        }
-        
-        // check heartbeat timeout
-        _heartbeatTimeout = [[data objectAtIndex:1] floatValue];
-        if (_heartbeatTimeout == 0.0) {
-            // couldn't find float value -> fail
-            connectionFailed = true;
-        }
-        else {
-            // add small buffer of 7sec (magic xD) otherwise heartbeat will be too late and connection is closed
-            _heartbeatTimeout += 7.0;
-        }
-        DEBUGLOG(@"heartbeatTimeout: %f", _heartbeatTimeout);
-        
-        // index 2 => connection timeout
-        
-        // get transports
-        NSString *t = [data objectAtIndex:3];
-        NSArray *transports = [t componentsSeparatedByString:@","];
-        DEBUGLOG(@"transports: %@", transports);
+    if([version09predicate evaluateWithObject:responseString])
+    {
+        DEBUGLOG(@"Response %@", responseString);
+        //version 09x
+        _version = V09x;
+        NSArray *data = [responseString componentsSeparatedByString:@":"];
+        // should be SID : heartbeat timeout : connection timeout : supported transports in V09x
+        // should be ...0{"sid":"<sid>","upgrades":[<transports>,...],"pingInterval":<timeHeartbeat>,"pingTimeout":<timeOut>} in V10x
         
-        static Class webSocketTransportClass;
-        static Class xhrTransportClass;
+        // check each returned value (thanks for the input https://github.com/taiyangc)
         
-        if (webSocketTransportClass == nil) {
-            webSocketTransportClass = NSClassFromString(@"SocketIOTransportWebsocket");
-        }
-        if (xhrTransportClass == nil) {
-            xhrTransportClass = NSClassFromString(@"SocketIOTransportXHR");
-        }
-        
-        if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound) {
-            DEBUGLOG(@"websocket supported -> using it now");
-            _transport = [[webSocketTransportClass alloc] initWithDelegate:self];
+        _sid = [data objectAtIndex:0];
+        if ([_sid length] < 1 || [data count] < 4) {
+            // did not receive valid data, possibly missing a useSecure?
+            connectionFailed = true;
         }
-        else if (xhrTransportClass != nil && [transports indexOfObject:@"xhr-polling"] != NSNotFound) {
-            DEBUGLOG(@"xhr polling supported -> using it now");
-            _transport = [[xhrTransportClass alloc] initWithDelegate:self];
+        else
+        {
+            // check SID
+            DEBUGLOG(@"sid: %@", _sid);
+            NSString *regex = @"[^0-9]";
+            NSPredicate *regexTest = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", regex];
+            if ([_sid rangeOfString:@"error"].location != NSNotFound || [regexTest evaluateWithObject:_sid])
+            {
+                [self connectToHost:_host onPort:_port withParams:_params withNamespace:_endpoint];
+                return;
+            }
+            
+            // check heartbeat timeout
+            _heartbeatTimeout = [[data objectAtIndex:1] floatValue];
+            if (_heartbeatTimeout == 0.0) {
+                // couldn't find float value -> fail
+                connectionFailed = true;
+            }
+            else {
+                // add small buffer of 7sec (magic xD) otherwise heartbeat will be too late and connection is closed
+                _heartbeatTimeout += 7.0;
+            }
+            
+            _connectionTimeout = [[data objectAtIndex:2] floatValue];
+            if (_connectionTimeout == 0.0) {
+                // couldn't find float value -> fail
+                connectionFailed = true;
+            }
+            else {
+                // add small buffer of 7sec (magic xD) otherwise connection will be too late and connection is closed
+                _connectionTimeout += 7.0;
+            }
+            DEBUGLOG(@"heartbeatTimeout: %f", _heartbeatTimeout);
+            
+            // index 2 => connection timeout
+            
+            // get transports
+            NSString *t = [data objectAtIndex:3];
+            NSArray *transports = [t componentsSeparatedByString:@","];
+            DEBUGLOG(@"transports: %@", transports);
+            
+            static Class webSocketTransportClass;
+            static Class xhrTransportClass;
+            
+            if (webSocketTransportClass == nil) {
+                webSocketTransportClass = NSClassFromString(@"SocketIOTransportWebsocket");
+            }
+            if (xhrTransportClass == nil) {
+                xhrTransportClass = NSClassFromString(@"SocketIOTransportXHR");
+            }
+            
+            if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound) {
+                DEBUGLOG(@"websocket supported -> using it now");
+                _transport = [[webSocketTransportClass alloc] initWithDelegate:self];
+            }
+            else if (xhrTransportClass != nil && [transports indexOfObject:@"xhr-polling"] != NSNotFound) {
+                DEBUGLOG(@"xhr polling supported -> using it now");
+                _transport = [[xhrTransportClass alloc] initWithDelegate:self];
+            }
+            else {
+                DEBUGLOG(@"no transport found that is supported :( -> fail");
+                connectionFailed = true;
+                error = [NSError errorWithDomain:SocketIOError
+                                            code:SocketIOTransportsNotSupported
+                                        userInfo:nil];
+            }
         }
-        else {
-            DEBUGLOG(@"no transport found that is supported :( -> fail");
-            connectionFailed = true;
-            error = [NSError errorWithDomain:SocketIOError
-                                        code:SocketIOTransportsNotSupported
-                                    userInfo:nil];
+    }
+    else
+    {
+        DEBUGLOG(@"VERSION 10x");
+        _version = V10x;
+        //...0{"sid":"<sid>","upgrades":[<transports>,...],"pingInterval":<timeHeartbeat>,"pingTimeout":<timeOut>}
+        responseString = [responseString substringFromIndex:[responseString rangeOfString:@"{"].location];
+        DEBUGLOG(@"Response %@", responseString);
+        connectionFailed = true;
+        NSData *utf8Data = [responseString dataUsingEncoding:NSUTF8StringEncoding];
+        NSDictionary *json = [SocketIOJSONSerialization objectFromJSONData:utf8Data error:nil];
+        if([json valueForKey:@"sid"] != nil
+           && [json valueForKey:@"upgrades"] != nil
+           && [json valueForKey:@"pingInterval"] != nil
+           && [json valueForKey:@"pingTimeout"] != nil)
+        {
+            connectionFailed = false;
+            _sid = [json objectForKey:@"sid"];
+            _heartbeatTimeout = [[json objectForKey:@"pingInterval"] floatValue] / 1000;
+            _connectionTimeout = [[json objectForKey:@"pingTimeout"] floatValue] / 1000;
+
+            
+            NSArray *transports = [json objectForKey:@"upgrades"];
+            static Class webSocketTransportClass;
+            static Class xhrTransportClass;
+            
+            if (webSocketTransportClass == nil) {
+                webSocketTransportClass = NSClassFromString(@"SocketIOTransportWebsocket");
+            }
+            if (xhrTransportClass == nil) {
+                xhrTransportClass = NSClassFromString(@"SocketIOTransportXHR");
+            }
+            
+            if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound) {
+                DEBUGLOG(@"websocket supported -> using it now");
+                _transport = [[webSocketTransportClass alloc] initWithDelegate:self];
+            }
+            else if (xhrTransportClass != nil && [transports indexOfObject:@"xhr-polling"] != NSNotFound) {
+                DEBUGLOG(@"xhr polling supported -> using it now");
+                _transport = [[xhrTransportClass alloc] initWithDelegate:self];
+            }
+            else {
+                DEBUGLOG(@"no transport found that is supported :( -> fail");
+                connectionFailed = true;
+                error = [NSError errorWithDomain:SocketIOError
+                                            code:SocketIOTransportsNotSupported
+                                        userInfo:nil];
+            }
         }
     }
     
     // if connection didn't return the values we need -> fail
-    if (connectionFailed) {
+    if (connectionFailed)
+    {
         // error already set!?
         if (error == nil) {
             error = [NSError errorWithDomain:SocketIOError
@@ -790,7 +1074,10 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
         return;
     }
     
-    [_transport open];
+    DEBUGLOG(@"Received All information:\n\tsid: %@\n\theartbeat: %f\n\tTransport: %@",_sid,_heartbeatTimeout,_transport);
+    
+    [_transport openUsing:_version];
+    [self setHeartBeat];
 }
 
 #if DEBUG_CERTIFICATE
diff --git a/SocketIOJSONSerialization.m b/SocketIOJSONSerialization.m
index 45eb448..705ea5d 100644
--- a/SocketIOJSONSerialization.m
+++ b/SocketIOJSONSerialization.m
@@ -26,7 +26,8 @@ + (id) objectFromJSONData:(NSData *)data error:(NSError **)error {
     return [NSJSONSerialization JSONObjectWithData:data options:0 error:error];    
 }
 
-+ (NSString *) JSONStringFromObject:(id)object error:(NSError **)error {
++ (NSString *) JSONStringFromObject:(id)object error:(NSError **)error
+{
     NSData *data = [NSJSONSerialization dataWithJSONObject:object options:0 error:error];
     return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];    
 }
diff --git a/SocketIOPacket.h b/SocketIOPacket.h
index ea1f30f..8fcfafe 100644
--- a/SocketIOPacket.h
+++ b/SocketIOPacket.h
@@ -19,10 +19,14 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "SocketIOTransport.h"
+
+@class SocketIOPacketV10x;
 
 @interface SocketIOPacket : NSObject
 {
     NSString *type;
+    NSString *_separator;
     NSString *pId;
     NSString *ack;
     NSString *name;
@@ -43,7 +47,22 @@
 - (id) initWithType:(NSString *)packetType;
 - (id) initWithTypeIndex:(int)index;
 - (id) dataAsJSON;
+- (NSString *) toString;
 - (NSNumber *) typeAsNumber;
 - (NSString *) typeForIndex:(int)index;
 
++ (SocketIOPacket *) createPacketWithType:(NSString *)type
+                              version:(SocketIOVersion) version;
++ (SocketIOPacket *) createPacketWithTypeIndex:(int) type
+                              version:(SocketIOVersion) version;
+@end
+
+@interface SocketIOPacketV10x : SocketIOPacket
+{    
+    NSArray *_typesMessage;
+}
+
 @end
+
+
+
diff --git a/SocketIOPacket.m b/SocketIOPacket.m
index d5c422b..cdac17c 100644
--- a/SocketIOPacket.m
+++ b/SocketIOPacket.m
@@ -21,6 +21,7 @@
 #import "SocketIOPacket.h"
 #import "SocketIOJSONSerialization.h"
 
+
 @implementation SocketIOPacket
 
 @synthesize type, pId, name, ack, data, args, endpoint;
@@ -28,17 +29,19 @@ @implementation SocketIOPacket
 - (id) init
 {
     self = [super init];
-    if (self) {
+    if (self)
+    {
+        _separator = @":";
         _types = [NSArray arrayWithObjects: @"disconnect",
-                  @"connect",
-                  @"heartbeat",
-                  @"message",
-                  @"json",
-                  @"event",
-                  @"ack",
-                  @"error",
-                  @"noop",
-                  nil];
+                            @"connect",
+                          @"heartbeat",
+                          @"message",
+                          @"json",
+                          @"event",
+                          @"ack",
+                          @"error",
+                          @"noop",
+                          nil];
     }
     return self;
 }
@@ -72,8 +75,52 @@ - (id) dataAsJSON
     }
 }
 
-- (NSNumber *) typeAsNumber
+
+- (NSString *) toString
 {
+    NSMutableArray *encoded = [NSMutableArray arrayWithObject:[self typeAsNumber]];
+    
+    NSString *pIdL = self.pId != nil ? self.pId : @"";
+
+
+    if( !([self isKindOfClass:[SocketIOPacketV10x class]]) ){
+        if ([self.ack isEqualToString:@"data"])
+        {
+            pIdL = [pIdL stringByAppendingString:@"+"];
+        }
+    }
+    
+    // Do not write pid for acknowledgements
+    if ([type intValue] != 6) {
+        [encoded addObject:pIdL];
+    }
+    
+    // Add the end point for the namespace to be used, as long as it is not
+    // an ACK, heartbeat, or disconnect packet
+    if ([type intValue] != 6 && [type intValue] != 2 && [type intValue] != 0) {
+        [encoded addObject:endpoint];
+    }
+    else {
+        [encoded addObject:@""];
+    }
+    
+    if (data != nil)
+    {
+        NSString *ackpId = @"";
+        // This is an acknowledgement packet, so, prepend the ack pid to the data
+        if ([type intValue] == 6)
+        {
+            if( !([self isKindOfClass:[SocketIOPacketV10x class]]) )
+                ackpId = [NSString stringWithFormat:@":%@%@", pIdL, @"+"];
+        }
+        [encoded addObject:[NSString stringWithFormat:@"%@%@", ackpId, data]];
+    }
+    
+    return [encoded componentsJoinedByString:_separator];
+}
+
+- (NSNumber *) typeAsNumber
+{    
     NSUInteger index = [_types indexOfObject:self.type];
     NSNumber *num = [NSNumber numberWithUnsignedInteger:index];
     return num;
@@ -84,6 +131,32 @@ - (NSString *) typeForIndex:(int)index
     return [_types objectAtIndex:index];
 }
 
++ (SocketIOPacket *) createPacketWithType:(NSString *)type
+                              version:(SocketIOVersion) version
+{
+    switch (version) {
+        case V09x:
+            return [[SocketIOPacket alloc] initWithType:type];
+            break;
+        case V10x:
+            return [[SocketIOPacketV10x alloc] initWithType:type];
+            break;
+    }
+}
+
++ (SocketIOPacket *) createPacketWithTypeIndex:(int) type
+                              version:(SocketIOVersion) version
+{
+    switch (version) {
+        case V09x:
+            return [[SocketIOPacket alloc] initWithTypeIndex:type];
+            break;
+        case V10x:
+            return [[SocketIOPacketV10x alloc] initWithTypeIndex:type];
+            break;
+    }
+}
+
 - (void) dealloc
 {
     _types = nil;
@@ -99,3 +172,63 @@ - (void) dealloc
 
 @end
 
+@implementation SocketIOPacketV10x
+
+- (id) init
+{
+    self = [super init];
+    
+    _separator = @"";
+    _types = [NSArray arrayWithObjects: @"disconnected",
+              @"connected",
+              @"heartbeat",
+              @"pong",
+              @"message",
+              @"upgrade",
+              @"noop",
+              nil];
+    _typesMessage = [NSArray arrayWithObjects: @"connect",
+                     @"disconnect",
+                     @"event",
+                     @"ack",
+                     @"error",
+                     @"binarevent",
+                     @"binaryack",
+                     nil];
+    return self;
+}
+
+- (NSNumber *) typeAsNumber
+{
+    NSNumber *num = 0;
+    NSUInteger index;
+    if(_typesMessage != nil && (index = [_typesMessage indexOfObject:self.type]) != NSNotFound)
+    {
+        //it's a message type
+        index = [_typesMessage indexOfObject:self.type];
+        num = @([num integerValue] + 40);
+    }
+    else
+    {
+        index = [_types indexOfObject:self.type];
+    }
+    num = @([num integerValue] + [[NSNumber numberWithUnsignedInteger:index] integerValue]);
+    return num;
+}
+
+- (void) dealloc
+{
+    _typesMessage = nil;
+    
+    _types = nil;
+    type = nil;
+    pId = nil;
+    name = nil;
+    ack = nil;
+    data = nil;
+    args = nil;
+    endpoint = nil;
+}
+
+@end
+
diff --git a/SocketIOTransport.h b/SocketIOTransport.h
index 9f8f7be..241ddfc 100644
--- a/SocketIOTransport.h
+++ b/SocketIOTransport.h
@@ -20,6 +20,13 @@
 
 #import <Foundation/Foundation.h>
 
+typedef enum SocketIOVersion
+{
+    V09x,
+    V10x
+} SocketIOVersion;
+
+
 @protocol SocketIOTransportDelegate <NSObject>
 
 - (void) onData:(id)message;
@@ -38,6 +45,7 @@
 
 - (id) initWithDelegate:(id <SocketIOTransportDelegate>)delegate;
 - (void) open;
+- (void) openUsing:(SocketIOVersion)version;
 - (void) close;
 - (BOOL) isReady;
 - (void) send:(NSString *)request;
diff --git a/SocketIOTransportWebsocket.m b/SocketIOTransportWebsocket.m
index 5b1579b..c88c2b9 100644
--- a/SocketIOTransportWebsocket.m
+++ b/SocketIOTransportWebsocket.m
@@ -29,10 +29,10 @@
 #define DEBUGLOG(...)
 #endif
 
-static NSString* kInsecureSocketURL = @"ws://%@/socket.io/1/websocket/%@";
-static NSString* kSecureSocketURL = @"wss://%@/socket.io/1/websocket/%@";
-static NSString* kInsecureSocketPortURL = @"ws://%@:%d/socket.io/1/websocket/%@";
-static NSString* kSecureSocketPortURL = @"wss://%@:%d/socket.io/1/websocket/%@";
+static NSString* kInsecureSocketURL = @"ws://%@/socket.io/1/websocket/%@%@";
+static NSString* kSecureSocketURL = @"wss://%@/socket.io/1/websocket/%@%@";
+static NSString* kInsecureSocketPortURL = @"ws://%@:%d/socket.io/1/websocket/%@%@";
+static NSString* kSecureSocketPortURL = @"wss://%@:%d/socket.io/1/websocket/%@%@";
 
 @implementation SocketIOTransportWebsocket
 
@@ -53,16 +53,26 @@ - (BOOL) isReady
 }
 
 - (void) open
+{
+    [self openUsing:V09x];
+}
+
+
+- (void) openUsing:(SocketIOVersion)version
 {
     NSString *urlStr;
     NSString *format;
+    NSString *addOnVersion = @"";
+    if(version == V10x)
+        addOnVersion = @"?EIO=2&transport=websocket&sid=";
+    
     if (delegate.port) {
         format = delegate.useSecure ? kSecureSocketPortURL : kInsecureSocketPortURL;
-        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.port, delegate.sid];
+        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.port, addOnVersion, delegate.sid];
     }
     else {
         format = delegate.useSecure ? kSecureSocketURL : kInsecureSocketURL;
-        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.sid];
+        urlStr = [NSString stringWithFormat:format, delegate.host,addOnVersion, delegate.sid];
     }
     NSURL *url = [NSURL URLWithString:urlStr];
     
@@ -104,6 +114,7 @@ - (void) webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message
 - (void) webSocketDidOpen:(SRWebSocket *)webSocket
 {
     DEBUGLOG(@"Socket opened.");
+    [_webSocket send:@"5"];
 }
 
 - (void) webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error
diff --git a/SocketIOTransportXHR.m b/SocketIOTransportXHR.m
index 771aef5..6e610ff 100644
--- a/SocketIOTransportXHR.m
+++ b/SocketIOTransportXHR.m
@@ -57,6 +57,12 @@ - (id) initWithDelegate:(id<SocketIOTransportDelegate>)delegate_
 }
 
 - (void) open
+{
+    [self openUsing:V09x];
+}
+
+
+- (void) openUsing:(SocketIOVersion)version
 {
     NSString *format;
     if (delegate.port) {
diff --git a/submodules/socket-rocket b/submodules/socket-rocket
index ce02374..8275ef3 160000
--- a/submodules/socket-rocket
+++ b/submodules/socket-rocket
@@ -1 +1 @@
-Subproject commit ce02374210f6e158d44a90eaaaf43fa7373eff21
+Subproject commit 8275ef3b15cebd99b1815840c55f4e07f96bf862