diff --git a/TinyGsmClient.h b/TinyGsmClient.h
index b9de490..040e9b2 100644
--- a/TinyGsmClient.h
+++ b/TinyGsmClient.h
@@ -11,6 +11,8 @@
 
 #if   defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM900)
   #include <TinyGsmClientSIM800.h>
+#elif   defined(TINY_GSM_MODEM_SIM808)
+#include <TinyGsmClientSIM808.h>
 #elif defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_A7)
   #include <TinyGsmClientA6.h>
 #elif defined(TINY_GSM_MODEM_M590)
diff --git a/TinyGsmClientSIM808.h b/TinyGsmClientSIM808.h
new file mode 100644
index 0000000..500f9e0
--- /dev/null
+++ b/TinyGsmClientSIM808.h
@@ -0,0 +1,1085 @@
+/**
+ * @file       TinyGsmClientSIM800.h
+ * @author     Volodymyr Shymanskyy
+ * @license    LGPL-3.0
+ * @copyright  Copyright (c) 2016 Volodymyr Shymanskyy
+ * @date       Nov 2016
+ */
+
+#ifndef TinyGsmClientSIM800_h
+#define TinyGsmClientSIM800_h
+
+//#define TINY_GSM_DEBUG Serial
+//#define TINY_GSM_USE_HEX
+
+#if !defined(TINY_GSM_RX_BUFFER)
+  #define TINY_GSM_RX_BUFFER 64
+#endif
+
+#define TINY_GSM_MUX_COUNT 5
+
+#include <TinyGsmCommon.h>
+
+#define GSM_NL "\r\n"
+static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL;
+static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
+
+enum SimStatus {
+  SIM_ERROR = 0,
+  SIM_READY = 1,
+  SIM_LOCKED = 2,
+};
+
+enum RegStatus {
+  REG_UNREGISTERED = 0,
+  REG_SEARCHING    = 2,
+  REG_DENIED       = 3,
+  REG_OK_HOME      = 1,
+  REG_OK_ROAMING   = 5,
+  REG_UNKNOWN      = 4,
+};
+
+
+class TinyGsm
+{
+
+public:
+
+class GsmClient : public Client
+{
+  friend class TinyGsm;
+  typedef TinyGsmFifo<uint8_t, TINY_GSM_RX_BUFFER> RxFifo;
+
+public:
+  GsmClient() {}
+
+  GsmClient(TinyGsm& modem, uint8_t mux = 1) {
+    init(&modem, mux);
+  }
+
+  bool init(TinyGsm* modem, uint8_t mux = 1) {
+    this->at = modem;
+    this->mux = mux;
+    sock_available = 0;
+    prev_check = 0;
+    sock_connected = false;
+    got_data = false;
+
+    at->sockets[mux] = this;
+
+    return true;
+  }
+
+public:
+  virtual int connect(const char *host, uint16_t port) {
+    TINY_GSM_YIELD();
+    rx.clear();
+    sock_connected = at->modemConnect(host, port, mux);
+    return sock_connected;
+  }
+
+  virtual int connect(IPAddress ip, uint16_t port) {
+    String host; host.reserve(16);
+    host += ip[0];
+    host += ".";
+    host += ip[1];
+    host += ".";
+    host += ip[2];
+    host += ".";
+    host += ip[3];
+    return connect(host.c_str(), port);
+  }
+
+  virtual void stop() {
+    TINY_GSM_YIELD();
+    at->sendAT(GF("+CIPCLOSE="), mux);
+    sock_connected = false;
+    at->waitResponse();
+  }
+
+  virtual size_t write(const uint8_t *buf, size_t size) {
+    TINY_GSM_YIELD();
+    at->maintain();
+    return at->modemSend(buf, size, mux);
+  }
+
+  virtual size_t write(uint8_t c) {
+    return write(&c, 1);
+  }
+
+  virtual int available() {
+    TINY_GSM_YIELD();
+    if (!rx.size() && sock_connected) {
+      // Workaround: sometimes SIM800 forgets to notify about data arrival.
+      // TODO: Currently we ping the module periodically,
+      // but maybe there's a better indicator that we need to poll
+      if (millis() - prev_check > 500) {
+        got_data = true;
+        prev_check = millis();
+      }
+      at->maintain();
+    }
+    return rx.size() + sock_available;
+  }
+
+  virtual int read(uint8_t *buf, size_t size) {
+    TINY_GSM_YIELD();
+    at->maintain();
+    size_t cnt = 0;
+    while (cnt < size) {
+      size_t chunk = TinyGsmMin(size-cnt, rx.size());
+      if (chunk > 0) {
+        rx.get(buf, chunk);
+        buf += chunk;
+        cnt += chunk;
+        continue;
+      }
+      // TODO: Read directly into user buffer?
+      at->maintain();
+      if (sock_available > 0) {
+        at->modemRead(rx.free(), mux);
+      } else {
+        break;
+      }
+    }
+    return cnt;
+  }
+
+  virtual int read() {
+    uint8_t c;
+    if (read(&c, 1) == 1) {
+      return c;
+    }
+    return -1;
+  }
+
+  virtual int peek() { return -1; } //TODO
+  virtual void flush() { at->stream.flush(); }
+
+  virtual uint8_t connected() {
+    if (available()) {
+      return true;
+    }
+    return sock_connected;
+  }
+  virtual operator bool() { return connected(); }
+
+  /*
+   * Extended API
+   */
+
+  String remoteIP() TINY_GSM_ATTR_NOT_IMPLEMENTED;
+
+private:
+  TinyGsm*      at;
+  uint8_t       mux;
+  uint16_t      sock_available;
+  uint32_t      prev_check;
+  bool          sock_connected;
+  bool          got_data;
+  RxFifo        rx;
+};
+
+public:
+
+  TinyGsm(Stream& stream)
+    : stream(stream)
+  {
+    memset(sockets, 0, sizeof(sockets));
+  }
+
+  /*
+   * Basic functions
+   */
+  bool begin() {
+    return init();
+  }
+
+  bool init() {
+    if (!autoBaud()) {
+      return false;
+    }
+    sendAT(GF("&FZ"));  // Factory + Reset
+    waitResponse();
+    sendAT(GF("E0"));   // Echo Off
+    if (waitResponse() != 1) {
+      return false;
+    }
+    getSimStatus();
+    return true;
+  }
+
+  bool autoBaud(unsigned long timeout = 10000L) {
+    //streamWrite(GF("AAAAA" GSM_NL));  // TODO: extra A's to help detect the baud rate
+    for (unsigned long start = millis(); millis() - start < timeout; ) {
+      sendAT(GF(""));
+      if (waitResponse(200) == 1) {
+          delay(100);
+          return true;
+      }
+      delay(100);
+    }
+    return false;
+  }
+
+  void maintain() {
+    for (int mux = 0; mux < TINY_GSM_MUX_COUNT; mux++) {
+      GsmClient* sock = sockets[mux];
+      if (sock && sock->got_data) {
+        sock->got_data = false;
+        sock->sock_available = modemGetAvailable(mux);
+      }
+    }
+    while (stream.available()) {
+      waitResponse(10, NULL, NULL);
+    }
+  }
+
+  bool factoryDefault() {
+    sendAT(GF("&FZE0&W"));  // Factory + Reset + Echo Off + Write
+    waitResponse();
+    sendAT(GF("+IPR=0"));   // Auto-baud
+    waitResponse();
+    sendAT(GF("+IFC=0,0")); // No Flow Control
+    waitResponse();
+    sendAT(GF("+ICF=3,3")); // 8 data 0 parity 1 stop
+    waitResponse();
+    sendAT(GF("+CSCLK=0")); // Disable Slow Clock
+    waitResponse();
+    sendAT(GF("&W"));       // Write configuration
+    return waitResponse() == 1;
+  }
+
+  String getModemInfo() {
+    sendAT(GF("I"));
+    String res;
+    if (waitResponse(1000L, res) != 1) {
+      return "";
+    }
+    res.replace(GSM_NL "OK" GSM_NL, "");
+    res.replace(GSM_NL, " ");
+    res.trim();
+    return res;
+  }
+
+  /*
+   * Power functions
+   */
+
+  bool restart() {
+    if (!autoBaud()) {
+      return false;
+    }
+    sendAT(GF("+CFUN=0"));
+    if (waitResponse(10000L) != 1) {
+      return false;
+    }
+    sendAT(GF("+CFUN=1,1"));
+    if (waitResponse(10000L) != 1) {
+      return false;
+    }
+    delay(3000);
+    return init();
+  }
+
+  bool poweroff() {
+    sendAT(GF("+CPOWD=1"));
+    return waitResponse(GF("NORMAL POWER DOWN")) == 1;
+  }
+
+  bool radioOff() {
+    if (!autoBaud()) {
+      return false;
+    }
+    sendAT(GF("+CFUN=0"));
+    if (waitResponse(10000L) != 1) {
+      return false;
+    }
+    delay(3000);
+    return true;
+  }
+
+  /*
+   * SIM card functions
+   */
+
+  bool simUnlock(const char *pin) {
+    sendAT(GF("+CPIN=\""), pin, GF("\""));
+    return waitResponse() == 1;
+  }
+
+  String getSimCCID() {
+    sendAT(GF("+ICCID"));
+    if (waitResponse(GF(GSM_NL "+ICCID:")) != 1) {
+      return "";
+    }
+    String res = stream.readStringUntil('\n');
+    waitResponse();
+    res.trim();
+    return res;
+  }
+
+  String getIMEI() {
+    sendAT(GF("+GSN"));
+    if (waitResponse(GF(GSM_NL)) != 1) {
+      return "";
+    }
+    String res = stream.readStringUntil('\n');
+    waitResponse();
+    res.trim();
+    return res;
+  }
+
+  SimStatus getSimStatus(unsigned long timeout = 10000L) {
+    for (unsigned long start = millis(); millis() - start < timeout; ) {
+      sendAT(GF("+CPIN?"));
+      if (waitResponse(GF(GSM_NL "+CPIN:")) != 1) {
+        delay(1000);
+        continue;
+      }
+      int status = waitResponse(GF("READY"), GF("SIM PIN"), GF("SIM PUK"), GF("NOT INSERTED"));
+      waitResponse();
+      switch (status) {
+      case 2:
+      case 3:  return SIM_LOCKED;
+      case 1:  return SIM_READY;
+      default: return SIM_ERROR;
+      }
+    }
+    return SIM_ERROR;
+  }
+
+  RegStatus getRegistrationStatus() {
+    sendAT(GF("+CREG?"));
+    if (waitResponse(GF(GSM_NL "+CREG:")) != 1) {
+      return REG_UNKNOWN;
+    }
+    streamSkipUntil(','); // Skip format (0)
+    int status = stream.readStringUntil('\n').toInt();
+    waitResponse();
+    return (RegStatus)status;
+  }
+
+  String getOperator() {
+    sendAT(GF("+COPS?"));
+    if (waitResponse(GF(GSM_NL "+COPS:")) != 1) {
+      return "";
+    }
+    streamSkipUntil('"'); // Skip mode and format
+    String res = stream.readStringUntil('"');
+    waitResponse();
+    return res;
+  }
+
+  /*
+   * Generic network functions
+   */
+
+  int getSignalQuality() {
+    sendAT(GF("+CSQ"));
+    if (waitResponse(GF(GSM_NL "+CSQ:")) != 1) {
+      return 99;
+    }
+    int res = stream.readStringUntil(',').toInt();
+    waitResponse();
+    return res;
+  }
+
+  bool waitForNetwork(unsigned long timeout = 60000L) {
+    for (unsigned long start = millis(); millis() - start < timeout; ) {
+      RegStatus s = getRegistrationStatus();
+      if (s == REG_OK_HOME || s == REG_OK_ROAMING) {
+        return true;
+      }
+      delay(1000);
+    }
+    return false;
+  }
+
+  /*
+   * GPRS functions
+   */
+  bool gprsConnect(const char* apn, const char* user, const char* pwd) {
+    gprsDisconnect();
+
+    sendAT(GF("+SAPBR=3,1,\"Contype\",\"GPRS\""));
+    waitResponse();
+
+    sendAT(GF("+SAPBR=3,1,\"APN\",\""), apn, '"');
+    waitResponse();
+
+    if (user) {
+      sendAT(GF("+SAPBR=3,1,\"USER\",\""), user, '"');
+      waitResponse();
+    }
+    if (pwd) {
+      sendAT(GF("+SAPBR=3,1,\"PWD\",\""), pwd, '"');
+      waitResponse();
+    }
+
+    sendAT(GF("+CGDCONT=1,\"IP\",\""), apn, '"');
+    waitResponse();
+
+    sendAT(GF("+CGACT=1,1"));
+    waitResponse(60000L);
+
+    // Open a GPRS context
+    sendAT(GF("+SAPBR=1,1"));
+    waitResponse(85000L);
+    // Query the GPRS context
+    sendAT(GF("+SAPBR=2,1"));
+    if (waitResponse(30000L) != 1)
+      return false;
+
+    sendAT(GF("+CGATT=1"));
+    if (waitResponse(60000L) != 1)
+      return false;
+
+    // TODO: wait AT+CGATT?
+
+    sendAT(GF("+CIPMUX=1"));
+    if (waitResponse() != 1) {
+      return false;
+    }
+
+    sendAT(GF("+CIPQSEND=1"));
+    if (waitResponse() != 1) {
+      return false;
+    }
+
+    sendAT(GF("+CIPRXGET=1"));
+    if (waitResponse() != 1) {
+      return false;
+    }
+
+    sendAT(GF("+CSTT=\""), apn, GF("\",\""), user, GF("\",\""), pwd, GF("\""));
+    if (waitResponse(60000L) != 1) {
+      return false;
+    }
+
+    sendAT(GF("+CIICR"));
+    if (waitResponse(60000L) != 1) {
+      return false;
+    }
+
+    sendAT(GF("+CIFSR;E0"));
+    if (waitResponse(10000L) != 1) {
+      return false;
+    }
+
+    sendAT(GF("+CDNSCFG=\"8.8.8.8\",\"8.8.4.4\""));
+    if (waitResponse() != 1) {
+      return false;
+    }
+
+    return true;
+  }
+
+  bool gprsDisconnect() {
+    sendAT(GF("+CIPSHUT"));
+    return waitResponse(60000L) == 1;
+  }
+
+  String getLocalIP() {
+    sendAT(GF("+CIFSR;E0"));
+    String res;
+    if (waitResponse(10000L, res) != 1) {
+      return "";
+    }
+    res.trim();
+    return res;
+  }
+
+  IPAddress localIP() {
+    IPAddress res;
+    res.fromString(getLocalIP());
+    return res;
+  }
+
+  /*
+   * Phone Call functions
+   */
+
+  bool setGsmBusy(bool busy = true) {
+    sendAT(GF("+GSMBUSY="), busy ? 1 : 0);
+    return waitResponse() == 1;
+  }
+
+  bool callAnswer() {
+    sendAT(GF("A"));
+    return waitResponse() == 1;
+  }
+
+  // Returns true on pick-up, false on error/busy
+  bool callNumber(const String& number) {
+    sendAT(GF("D"), number, ";");
+    int status = waitResponse(60000L, GF("OK"), GF("BUSY"), GF("NO ANSWER"), GF("NO CARRIER"));
+    switch (status) {
+    case 1:  return true;
+    case 2:
+    case 3:  return false;
+    default: return false;
+    }
+  }
+
+  //bool callRedial() {
+  //  sendAT(GF("DL"));
+  //  return waitResponse() == 1;
+  //}
+
+  bool callHangup() {
+    sendAT(GF("H"));
+    return waitResponse() == 1;
+  }
+
+  /*
+   * Messaging functions
+   */
+
+  String sendUSSD(const String& code) {
+    sendAT(GF("+CMGF=1"));
+    waitResponse();
+    sendAT(GF("+CSCS=\"HEX\""));
+    waitResponse();
+    sendAT(GF("+CUSD=1,\""), code, GF("\""));
+    if (waitResponse() != 1) {
+      return "";
+    }
+    if (waitResponse(10000L, GF(GSM_NL "+CUSD:")) != 1) {
+      return "";
+    }
+    stream.readStringUntil('"');
+    String hex = stream.readStringUntil('"');
+    stream.readStringUntil(',');
+    int dcs = stream.readStringUntil('\n').toInt();
+
+    if (dcs == 15) {
+      return decodeHex8bit(hex);
+    } else if (dcs == 72) {
+      return decodeHex16bit(hex);
+    } else {
+      return hex;
+    }
+  }
+
+  bool sendSMS(const String& number, const String& text) {
+    sendAT(GF("+CMGF=1"));
+    waitResponse();
+    sendAT(GF("+CMGS=\""), number, GF("\""));
+    if (waitResponse(GF(">")) != 1) {
+      return false;
+    }
+    stream.print(text);
+    stream.write((char)0x1A);
+    stream.flush();
+    return waitResponse(60000L) == 1;
+  }
+
+  bool sendSMS_UTF16(const String& number, const void* text, size_t len) {
+    sendAT(GF("+CMGF=1"));
+    waitResponse();
+    sendAT(GF("+CSCS=\"HEX\""));
+    waitResponse();
+    sendAT(GF("+CSMP=17,167,0,8"));
+    waitResponse();
+
+    sendAT(GF("+CMGS=\""), number, GF("\""));
+    if (waitResponse(GF(">")) != 1) {
+      return false;
+    }
+
+    uint16_t* t = (uint16_t*)text;
+    for (size_t i=0; i<len; i++) {
+      uint8_t c = t[i] >> 8;
+      if (c < 0x10) { stream.print('0'); }
+      stream.print(c, HEX);
+      c = t[i] & 0xFF;
+      if (c < 0x10) { stream.print('0'); }
+      stream.print(c, HEX);
+    }
+    stream.write((char)0x1A);
+    stream.flush();
+    return waitResponse(60000L) == 1;
+  }
+    
+    int getNumSMS() {
+        
+        sendAT(GF("+CMGF=1"));
+        if (waitResponse() != 1) {
+            return 0;
+        }
+        
+        sendAT(GF("+CPMS?"));
+        if (waitResponse(GF(GSM_NL "+CPMS:")) != 1) {
+            return 0;
+        }
+        String res = stream.readStringUntil('\n');
+        int index1 = res.indexOf(",");
+        int index2 = res.indexOf(",", index1+1);
+        String tmp = res.substring(index1+1,index2);
+        waitResponse();
+        //res.trim();
+        tmp.trim();
+        //return res;
+        //int num = tmp.toInt();
+        return tmp.toInt();
+    }
+    
+    String readSMS(int num, char *sender) {
+        String buffer;
+        
+        sendAT(GF("+CMGF=1"));
+        if (waitResponse() != 1) {
+            return "";
+        }
+        sendAT(GF("+CSDH=1"));
+        if (waitResponse() != 1) {
+            return "";
+        }
+        
+        
+        sendAT(GF("+CMGR="), num, GF(""));
+        if (waitResponse(GF(GSM_NL "+CMGR:")) != 1) {
+            return "";
+        }
+        
+        stream.readStringUntil(',');
+        buffer = stream.readStringUntil(',');
+        buffer.replace('"', ' ');
+        buffer.trim();
+        buffer.toCharArray(sender, 18);
+        
+        stream.readStringUntil('\r');
+        
+        buffer = "";
+        
+        delay(20); // Wait a moment to get data into the buffer
+        while (stream.available()) {
+            char c = stream.read();
+            buffer = buffer + c;
+        }
+        
+        String res = buffer;
+        waitResponse();
+        res.trim();
+        return res;
+    }
+    
+    boolean deleteSMS(int num) {
+        sendAT(GF("+CMGD="), num, GF(""));
+        if (waitResponse(GF(GSM_NL "+CMGD:")) != 1) {
+            return false;
+        }
+        return true;
+    }
+
+
+  /*
+   * Location functions
+   */
+
+  String getGsmLocation() {
+    sendAT(GF("+CIPGSMLOC=1,1"));
+    if (waitResponse(10000L, GF(GSM_NL "+CIPGSMLOC:")) != 1) {
+      return "";
+    }
+    String res = stream.readStringUntil('\n');
+    waitResponse();
+    res.trim();
+    return res;
+  }
+
+  /*
+   * Battery functions
+   */
+  // Use: float vBatt = modem.getBattVoltage() / 1000.0;
+  uint16_t getBattVoltage() {
+    sendAT(GF("+CBC"));
+    if (waitResponse(GF(GSM_NL "+CBC:")) != 1) {
+      return 0;
+    }
+    streamSkipUntil(','); // Skip
+    streamSkipUntil(','); // Skip
+
+    uint16_t res = stream.readStringUntil(',').toInt();
+    waitResponse();
+    return res;
+  }
+
+  int getBattPercent() {
+    sendAT(GF("+CBC"));
+    if (waitResponse(GF(GSM_NL "+CBC:")) != 1) {
+      return false;
+    }
+    stream.readStringUntil(',');
+    int res = stream.readStringUntil(',').toInt();
+    waitResponse();
+    return res;
+  }
+    
+    
+    
+    
+    
+/*
+ * GPS location functions
+ */
+    
+    
+    // enable GPS
+    boolean enableGPS() {
+        uint16_t state;
+        
+        sendAT(GF("+CGNSPWR=1"));
+        if (waitResponse() != 1) {
+            return false;
+        }
+        
+        return true;
+    }
+    
+    boolean disableGPS() {
+        uint16_t state;
+        
+        sendAT(GF("+CGNSPWR=0"));
+        if (waitResponse() != 1) {
+            return false;
+        }
+        
+        return true;
+    }
+    
+    // get the RAW GPS output
+    // works only with ans SIM808 V2
+    String getGPSraw() {
+        sendAT(GF("+CGNSINF"));
+        if (waitResponse(GF(GSM_NL "+CGNSINF:")) != 1) {
+            return "";
+        }
+        String res = stream.readStringUntil('\n');
+        waitResponse();
+        res.trim();
+        return res;
+    }
+    
+    // get GPS informations
+    // works only with ans SIM808 V2
+    boolean getGPS(float *lat, float *lon, float *speed=0, int *alt=0, int *vsat=0, int *usat=0) {
+        //String buffer = "";
+        char chr_buffer[12];
+        boolean fix = false;
+        
+        sendAT(GF("+CGNSINF"));
+        if (waitResponse(GF(GSM_NL "+CGNSINF:")) != 1) {
+            return false;
+        }
+        
+        stream.readStringUntil(','); // mode
+        if ( stream.readStringUntil(',').toInt() == 1 ) fix = true;
+        stream.readStringUntil(','); //utctime
+        *lat =  stream.readStringUntil(',').toFloat(); //lat
+        *lon =  stream.readStringUntil(',').toFloat(); //lon
+        if (alt != NULL) *alt =  stream.readStringUntil(',').toFloat(); //lon
+        if (speed != NULL) *speed = stream.readStringUntil(',').toFloat(); //speed
+        stream.readStringUntil(',');
+        stream.readStringUntil(',');
+        stream.readStringUntil(',');
+        stream.readStringUntil(',');
+        stream.readStringUntil(',');
+        stream.readStringUntil(',');
+        stream.readStringUntil(',');
+        if (vsat != NULL) *vsat = stream.readStringUntil(',').toInt(); //viewed satelites
+        if (usat != NULL) *usat = stream.readStringUntil(',').toInt(); //used satelites
+        stream.readStringUntil('\n');
+        
+        
+        waitResponse();
+        
+        return fix;
+    }
+    
+    // get GPS time
+    // works only with SIM808 V2
+    boolean getGPSTime(int *year, int *month, int *day, int *hour, int *minute, int *second) {
+        boolean fix = false;
+        char chr_buffer[12];
+        sendAT(GF("+CGNSINF"));
+        if (waitResponse(GF(GSM_NL "+CGNSINF:")) != 1) {
+            return false;
+        }
+        
+        
+        for (int i = 0; i < 3; i++) {
+            String buffer = stream.readStringUntil(',');
+            buffer.toCharArray(chr_buffer, sizeof(chr_buffer));
+            switch (i) {
+                case 0:
+                    //mode
+                    break;
+                case 1:
+                    //fixstatus
+                    if ( buffer.toInt() == 1 ) {
+                        fix = buffer.toInt();
+                    }
+                    break;
+                case 2:
+                    *year = buffer.substring(0,4).toInt();
+                    *month = buffer.substring(4,6).toInt();
+                    *day = buffer.substring(6,8).toInt();
+                    *hour = buffer.substring(8,10).toInt();
+                    *minute = buffer.substring(10,12).toInt();
+                    *second = buffer.substring(12,14).toInt();
+                    break;
+                    
+                default:
+                    // if nothing else matches, do the default
+                    // default is optional
+                    break;
+            }
+        }
+        String res = stream.readStringUntil('\n');
+        waitResponse();
+        
+        if (fix) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+private:
+
+  bool modemConnect(const char* host, uint16_t port, uint8_t mux) {
+    sendAT(GF("+CIPSTART="), mux, ',', GF("\"TCP"), GF("\",\""), host, GF("\","), port);
+    int rsp = waitResponse(75000L,
+                           GF("CONNECT OK" GSM_NL),
+                           GF("CONNECT FAIL" GSM_NL),
+                           GF("ALREADY CONNECT" GSM_NL));
+    return (1 == rsp);
+  }
+
+  int modemSend(const void* buff, size_t len, uint8_t mux) {
+    sendAT(GF("+CIPSEND="), mux, ',', len);
+    if (waitResponse(GF(">")) != 1) {
+      return -1;
+    }
+    stream.write((uint8_t*)buff, len);
+    stream.flush();
+    if (waitResponse(GF(GSM_NL "DATA ACCEPT:")) != 1) {
+      return -1;
+    }
+    streamSkipUntil(','); // Skip mux
+    return stream.readStringUntil('\n').toInt();
+  }
+
+  size_t modemRead(size_t size, uint8_t mux) {
+#ifdef TINY_GSM_USE_HEX
+    sendAT(GF("+CIPRXGET=3,"), mux, ',', size);
+    if (waitResponse(GF("+CIPRXGET:")) != 1) {
+      return 0;
+    }
+#else
+    sendAT(GF("+CIPRXGET=2,"), mux, ',', size);
+    if (waitResponse(GF("+CIPRXGET:")) != 1) {
+      return 0;
+    }
+#endif
+    streamSkipUntil(','); // Skip mode 2/3
+    streamSkipUntil(','); // Skip mux
+    size_t len = stream.readStringUntil(',').toInt();
+    sockets[mux]->sock_available = stream.readStringUntil('\n').toInt();
+
+    for (size_t i=0; i<len; i++) {
+#ifdef TINY_GSM_USE_HEX
+      while (stream.available() < 2) { TINY_GSM_YIELD(); }
+      char buf[4] = { 0, };
+      buf[0] = stream.read();
+      buf[1] = stream.read();
+      char c = strtol(buf, NULL, 16);
+#else
+      while (!stream.available()) { TINY_GSM_YIELD(); }
+      char c = stream.read();
+#endif
+      sockets[mux]->rx.put(c);
+    }
+    waitResponse();
+    return len;
+  }
+
+  size_t modemGetAvailable(uint8_t mux) {
+    sendAT(GF("+CIPRXGET=4,"), mux);
+    size_t result = 0;
+    if (waitResponse(GF("+CIPRXGET:")) == 1) {
+      streamSkipUntil(','); // Skip mode 4
+      streamSkipUntil(','); // Skip mux
+      result = stream.readStringUntil('\n').toInt();
+      waitResponse();
+    }
+    if (!result) {
+      sockets[mux]->sock_connected = modemGetConnected(mux);
+    }
+    return result;
+  }
+
+  bool modemGetConnected(uint8_t mux) {
+    sendAT(GF("+CIPSTATUS="), mux);
+    int res = waitResponse(GF(",\"CONNECTED\""), GF(",\"CLOSED\""), GF(",\"CLOSING\""), GF(",\"INITIAL\""));
+    waitResponse();
+    return 1 == res;
+  }
+
+  static String decodeHex8bit(String &instr) {
+    String result;
+    for (unsigned i=0; i<instr.length(); i+=2) {
+      char buf[4] = { 0, };
+      buf[0] = instr[i];
+      buf[1] = instr[i+1];
+      char b = strtol(buf, NULL, 16);
+      result += b;
+    }
+    return result;
+  }
+
+  static String decodeHex16bit(String &instr) {
+    String result;
+    for (unsigned i=0; i<instr.length(); i+=4) {
+      char buf[4] = { 0, };
+      buf[0] = instr[i];
+      buf[1] = instr[i+1];
+      char b = strtol(buf, NULL, 16);
+      if (b) { // If high byte is non-zero, we can't handle it ;(
+        b = '?';
+      } else {
+        buf[0] = instr[i+2];
+        buf[1] = instr[i+3];
+        b = strtol(buf, NULL, 16);
+      }
+      result += b;
+    }
+    return result;
+  }
+
+public:
+
+  /* Utilities */
+
+  template<typename T>
+  void streamWrite(T last) {
+    stream.print(last);
+  }
+
+  template<typename T, typename... Args>
+  void streamWrite(T head, Args... tail) {
+    stream.print(head);
+    streamWrite(tail...);
+  }
+
+  bool streamSkipUntil(char c) { //TODO: timeout
+    while (true) {
+      while (!stream.available()) { TINY_GSM_YIELD(); }
+      if (stream.read() == c)
+        return true;
+    }
+    return false;
+  }
+
+  template<typename... Args>
+  void sendAT(Args... cmd) {
+    streamWrite("AT", cmd..., GSM_NL);
+    stream.flush();
+    TINY_GSM_YIELD();
+    //DBG("### AT:", cmd...);
+  }
+
+  // TODO: Optimize this!
+  uint8_t waitResponse(uint32_t timeout, String& data,
+                       GsmConstStr r1=GFP(GSM_OK), GsmConstStr r2=GFP(GSM_ERROR),
+                       GsmConstStr r3=NULL, GsmConstStr r4=NULL, GsmConstStr r5=NULL)
+  {
+    /*String r1s(r1); r1s.trim();
+    String r2s(r2); r2s.trim();
+    String r3s(r3); r3s.trim();
+    String r4s(r4); r4s.trim();
+    String r5s(r5); r5s.trim();
+    DBG("### ..:", r1s, ",", r2s, ",", r3s, ",", r4s, ",", r5s);*/
+    data.reserve(64);
+    int index = 0;
+    unsigned long startMillis = millis();
+    do {
+      TINY_GSM_YIELD();
+      while (stream.available() > 0) {
+        int a = stream.read();
+        if (a <= 0) continue; // Skip 0x00 bytes, just in case
+        data += (char)a;
+        if (r1 && data.endsWith(r1)) {
+          index = 1;
+          goto finish;
+        } else if (r2 && data.endsWith(r2)) {
+          index = 2;
+          goto finish;
+        } else if (r3 && data.endsWith(r3)) {
+          index = 3;
+          goto finish;
+        } else if (r4 && data.endsWith(r4)) {
+          index = 4;
+          goto finish;
+        } else if (r5 && data.endsWith(r5)) {
+          index = 5;
+          goto finish;
+        } else if (data.endsWith(GF(GSM_NL "+CIPRXGET:"))) {
+          String mode = stream.readStringUntil(',');
+          if (mode.toInt() == 1) {
+            int mux = stream.readStringUntil('\n').toInt();
+            if (mux >= 0 && mux < TINY_GSM_MUX_COUNT) {
+              sockets[mux]->got_data = true;
+            }
+            data = "";
+          } else {
+            data += mode;
+          }
+        } else if (data.endsWith(GF("CLOSED" GSM_NL))) {
+          int nl = data.lastIndexOf(GSM_NL, data.length()-8);
+          int coma = data.indexOf(',', nl+2);
+          int mux = data.substring(nl+2, coma).toInt();
+          if (mux >= 0 && mux < TINY_GSM_MUX_COUNT) {
+            sockets[mux]->sock_connected = false;
+          }
+          data = "";
+          DBG("### Closed: ", mux);
+        }
+      }
+    } while (millis() - startMillis < timeout);
+finish:
+    if (!index) {
+      data.trim();
+      if (data.length()) {
+        DBG("### Unhandled:", data);
+      }
+      data = "";
+    }
+    return index;
+  }
+
+  uint8_t waitResponse(uint32_t timeout,
+                       GsmConstStr r1=GFP(GSM_OK), GsmConstStr r2=GFP(GSM_ERROR),
+                       GsmConstStr r3=NULL, GsmConstStr r4=NULL, GsmConstStr r5=NULL)
+  {
+    String data;
+    return waitResponse(timeout, data, r1, r2, r3, r4, r5);
+  }
+
+  uint8_t waitResponse(GsmConstStr r1=GFP(GSM_OK), GsmConstStr r2=GFP(GSM_ERROR),
+                       GsmConstStr r3=NULL, GsmConstStr r4=NULL, GsmConstStr r5=NULL)
+  {
+    return waitResponse(1000, r1, r2, r3, r4, r5);
+  }
+
+private:
+  Stream&       stream;
+  GsmClient*    sockets[TINY_GSM_MUX_COUNT];
+};
+
+typedef TinyGsm::GsmClient TinyGsmClient;
+
+#endif