diff --git a/keywords.txt b/keywords.txt
deleted file mode 100755
index c391e6c..0000000
--- a/keywords.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-JsonArray	KEYWORD1
-add	KEYWORD2
-createArray	KEYWORD3
diff --git a/src/ESPAsyncTCP.cpp b/src/ESPAsyncTCP.cpp
index 73e9780..818244c 100644
--- a/src/ESPAsyncTCP.cpp
+++ b/src/ESPAsyncTCP.cpp
@@ -134,6 +134,10 @@ void AsyncClient::close(){
   _close_pcb = true;
 }
 
+void AsyncClient::stop() {
+    close();
+}
+
 bool AsyncClient::free(){
   if(!_pcb)
     return true;
@@ -150,8 +154,15 @@ bool AsyncClient::free(){
   return false;
 }
 
+size_t AsyncClient::write(const char* data) {
+    if(data == NULL) {
+        return 0;
+    }
+    return write(data, strlen(data));
+}
+
 size_t AsyncClient::write(const char* data, size_t size) {
-  if(!_pcb || size == 0)
+  if(!_pcb || size == 0 || data == NULL)
     return 0;
   if(!canSend())
     return 0;
@@ -200,12 +211,16 @@ int8_t AsyncClient::_connected(void* pcb, int8_t err){
 }
 
 void AsyncClient::_error(int8_t err) {
-  if(_error_cb)
+  if(_error_cb) {
     _error_cb(_error_cb_arg, this, err);
+  }
   if(err){
-    _pcb->state = (tcp_state)0;
-    if(_discard_cb)
+    if(_pcb) {
+      _pcb->state = (tcp_state)0;
+    }
+    if(_discard_cb) {
       _discard_cb(_discard_cb_arg, this);
+    }
   }
 }
 
@@ -364,6 +379,34 @@ uint16_t AsyncClient::getLocalPort() {
   return _pcb->local_port;
 }
 
+IPAddress AsyncClient::remoteIP() {
+    if(!_pcb) {
+        return IPAddress(0U);
+    }
+    return IPAddress(_pcb->remote_ip.addr);
+}
+
+uint16_t AsyncClient::remotePort() {
+    if(!_pcb) {
+        return 0;
+    }
+    return _pcb->remote_port;
+}
+
+IPAddress AsyncClient::localIP() {
+    if(!_pcb) {
+        return IPAddress(0U);
+    }
+    return IPAddress(_pcb->local_ip.addr);
+}
+
+uint16_t AsyncClient::localPort() {
+    if(!_pcb) {
+        return 0;
+    }
+    return _pcb->local_port;
+}
+
 uint8_t AsyncClient::state() {
   if(!_pcb) return 0;
   return _pcb->state;
diff --git a/src/ESPAsyncTCP.h b/src/ESPAsyncTCP.h
index b5b96c8..cedb671 100644
--- a/src/ESPAsyncTCP.h
+++ b/src/ESPAsyncTCP.h
@@ -45,7 +45,8 @@ struct tcp_pcb;
 struct pbuf;
 
 class AsyncClient {
-  private:
+  protected:
+    friend class AsyncTCPbuffer;
     tcp_pcb* _pcb;
     AcConnectHandler _connect_cb;
     void* _connect_cb_arg;
@@ -99,12 +100,14 @@ class AsyncClient {
     bool connect(IPAddress ip, uint16_t port);
     bool connect(const char* host, uint16_t port);
     void close();
+    void stop();
     //int8_t _close();
     int8_t abort();
     bool free();
 
     bool canSend();//ack is not pending
     size_t space();
+    size_t write(const char* data);
     size_t write(const char* data, size_t size); //only when canSend() == true
 
     uint8_t state();
@@ -123,6 +126,10 @@ class AsyncClient {
     uint32_t getLocalAddress();
     uint16_t getLocalPort();
 
+    IPAddress remoteIP();
+    uint16_t  remotePort();
+    IPAddress localIP();
+    uint16_t  localPort();
 
     void onConnect(AcConnectHandler cb, void* arg = 0);     //on successful connect
     void onDisconnect(AcConnectHandler cb, void* arg = 0);  //disconnected
@@ -137,7 +144,7 @@ class AsyncClient {
 };
 
 class AsyncServer {
-  private:
+  protected:
     uint16_t _port;
     IPAddress _addr;
     tcp_pcb* _pcb;
diff --git a/src/ESPAsyncTCPbuffer.cpp b/src/ESPAsyncTCPbuffer.cpp
new file mode 100644
index 0000000..038a29f
--- /dev/null
+++ b/src/ESPAsyncTCPbuffer.cpp
@@ -0,0 +1,495 @@
+/**
+ * @file  ESPAsyncTCPbuffer.cpp
+ * @date  22.01.2016
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the Asynv TCP for ESP.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+
+#include <Arduino.h>
+#include <debug.h>
+
+#include "ESPAsyncTCPbuffer.h"
+
+
+AsyncTCPbuffer::AsyncTCPbuffer(AsyncClient* client) {
+    if(client == NULL) {
+        DEBUG_ASYNC_TCP("[A-TCP] client is null!!!\n");
+        panic();
+    }
+
+    _client = client;
+    _TXbuffer = new cbuf(1460);
+    _RXbuffer = new cbuf(100);
+    _RXmode = ATB_RX_MODE_FREE;
+    _rxSize = 0;
+    _rxTerminator = 0x00;
+    _rxReadBytesPtr = NULL;
+    _rxReadStringPtr = NULL;
+    _cbDisconnect = NULL;
+
+    _cbRX = NULL;
+    _cbDone = NULL;
+    _attachCallbacks();
+}
+
+AsyncTCPbuffer::~AsyncTCPbuffer() {
+    if(_client) {
+        _client->close();
+    }
+
+    if(_RXbuffer) {
+        delete _RXbuffer;
+        _RXbuffer = NULL;
+    }
+    if(_TXbuffer) {
+        delete _TXbuffer;
+        _TXbuffer = NULL;
+    }
+}
+
+size_t AsyncTCPbuffer::write(String data) {
+    return write(data.c_str(), data.length());
+}
+
+size_t AsyncTCPbuffer::write(uint8_t data) {
+    return write(&data, 1);
+}
+
+size_t AsyncTCPbuffer::write(const char* data) {
+    return write((const uint8_t *) data, strlen(data));
+}
+
+size_t AsyncTCPbuffer::write(const char *data, size_t len) {
+    return write((const uint8_t *) data, len);
+}
+
+/**
+ * write data in to buffer and try to send the data
+ * @param data
+ * @param len
+ * @return
+ */
+size_t AsyncTCPbuffer::write(const uint8_t *data, size_t len) {
+    if(_TXbuffer == NULL || _client == NULL || !_client->connected() || data == NULL || len == 0) {
+        return 0;
+    }
+
+    size_t bytesLeft = len;
+    size_t free = _TXbuffer->room();
+
+    while(free < bytesLeft) {
+
+        size_t w = (bytesLeft - free);
+        w = _TXbuffer->write((const char*) data, w);
+        bytesLeft -= w;
+        data += w;
+
+        while(!_client->canSend()) {
+            optimistic_yield(1000);
+        }
+
+        _sendBuffer();
+        free = _TXbuffer->room();
+    }
+
+    _TXbuffer->write((const char*) data, bytesLeft);
+    _sendBuffer();
+    return len;
+
+}
+
+/**
+ * wait until all data has send out
+ */
+void AsyncTCPbuffer::flush() {
+    while(!_TXbuffer->empty()) {
+        while(!_client->canSend()) {
+            delay(0);
+        }
+        _sendBuffer();
+    }
+}
+
+void AsyncTCPbuffer::noCallback() {
+    _RXmode = ATB_RX_MODE_NONE;
+}
+
+void AsyncTCPbuffer::readStringUntil(char terminator, String * str, AsyncTCPbufferDoneCb done) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] readStringUntil terminator: %02X\n", terminator);
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = done;
+    _rxReadStringPtr = str;
+    _rxTerminator = terminator;
+    _rxSize = 0;
+    _RXmode = ATB_RX_MODE_TERMINATOR_STRING;
+}
+
+/*
+ void AsyncTCPbuffer::readBytesUntil(char terminator, char *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+ _RXmode = ATB_RX_MODE_NONE;
+ _cbDone = done;
+ _rxReadBytesPtr = (uint8_t *) buffer;
+ _rxTerminator = terminator;
+ _rxSize = length;
+ _RXmode = ATB_RX_MODE_TERMINATOR;
+ _handleRxBuffer(NULL, 0);
+ }
+
+ void AsyncTCPbuffer::readBytesUntil(char terminator, uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+ readBytesUntil(terminator, (char *) buffer, length, done);
+ }
+ */
+
+void AsyncTCPbuffer::readBytes(char *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] readBytes length: %d\n", length);
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = done;
+    _rxReadBytesPtr = (uint8_t *) buffer;
+    _rxSize = length;
+    _RXmode = ATB_RX_MODE_READ_BYTES;
+}
+
+void AsyncTCPbuffer::readBytes(uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+    readBytes((char *) buffer, length, done);
+}
+
+void AsyncTCPbuffer::onData(AsyncTCPbufferDataCb cb) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] onData\n");
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = NULL;
+    _cbRX = cb;
+    _RXmode = ATB_RX_MODE_FREE;
+}
+
+void AsyncTCPbuffer::onDisconnect(AsyncTCPbufferDisconnectCb cb) {
+    _cbDisconnect = cb;
+}
+
+IPAddress AsyncTCPbuffer::remoteIP() {
+    if(!_client) {
+        return IPAddress(0U);
+    }
+    return _client->remoteIP();
+}
+
+uint16_t AsyncTCPbuffer::remotePort() {
+    if(!_client) {
+        return 0;
+    }
+    return _client->remotePort();
+}
+
+bool AsyncTCPbuffer::connected() {
+    if(!_client) {
+        return false;
+    }
+    return _client->connected();
+}
+
+void AsyncTCPbuffer::stop() {
+
+    if(!_client) {
+        return;
+    }
+    _client->stop();
+    _client = NULL;
+
+    if(_cbDone) {
+        switch(_RXmode) {
+            case ATB_RX_MODE_READ_BYTES:
+            case ATB_RX_MODE_TERMINATOR:
+            case ATB_RX_MODE_TERMINATOR_STRING:
+                _RXmode = ATB_RX_MODE_NONE;
+                _cbDone(false, NULL);
+                break;
+        }
+    }
+    _RXmode = ATB_RX_MODE_NONE;
+}
+
+void AsyncTCPbuffer::close() {
+    stop();
+}
+
+
+///--------------------------------
+
+/**
+ * attachCallbacks to AsyncClient class
+ */
+void AsyncTCPbuffer::_attachCallbacks() {
+    if(!_client) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] attachCallbacks\n");
+
+    _client->onPoll([](void *obj, AsyncClient* c) {
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        if(!b->_TXbuffer->empty()) {
+            b->_sendBuffer();
+        }
+        //    if(!b->_RXbuffer->empty()) {
+        //       b->_handleRxBuffer(NULL, 0);
+        //   }
+    }, this);
+
+    _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time) {
+        DEBUG_ASYNC_TCP("[A-TCP] onAck\n");
+        ((AsyncTCPbuffer*)(obj))->_sendBuffer();
+    }, this);
+
+    _client->onDisconnect([](void *obj, AsyncClient* c) {
+        DEBUG_ASYNC_TCP("[A-TCP] onDisconnect\n");
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        c->free();
+        delete c;
+        b->_client = NULL;
+        bool del = true;
+        if(b->_cbDisconnect) {
+            del = b->_cbDisconnect(b);
+        }
+        if(del) {
+            delete b;
+        }
+    }, this);
+
+    _client->onData([](void *obj, AsyncClient* c, void *buf, size_t len) {
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        b->_rxData((uint8_t *)buf, len);
+    }, this);
+
+    _client->onTimeout([](void *obj, AsyncClient* c, uint32_t time){
+        DEBUG_ASYNC_TCP("[A-TCP] onTimeout\n");
+        c->close();
+    }, this);
+
+    DEBUG_ASYNC_TCP("[A-TCP] attachCallbacks Done.\n");
+}
+
+/**
+ * send TX buffer if possible
+ */
+void AsyncTCPbuffer::_sendBuffer() {
+    //DEBUG_ASYNC_TCP("[A-TCP] _sendBuffer...\n");
+    size_t available = _TXbuffer->available();
+    if(available == 0 || _client == NULL || !_client->connected() || !_client->canSend()) {
+        return;
+    }
+
+    if(available > _client->space()) {
+        available = _client->space();
+    }
+
+    char *out = new char[available];
+    if(out == NULL) {
+        DEBUG_ASYNC_TCP("[A-TCP] to less heap\n");
+        return;
+    }
+    _TXbuffer->read(out, available);
+
+    size_t send = _client->write((const char*) out, available);
+    if(send != available) {
+        DEBUG_ASYNC_TCP("[A-TCP] write failed\n");
+    }
+
+    delete out;
+}
+
+/**
+ * called on incoming data
+ * @param buf
+ * @param len
+ */
+void AsyncTCPbuffer::_rxData(uint8_t *buf, size_t len) {
+    if(!_client || !_client->connected()) {
+        DEBUG_ASYNC_TCP("[A-TCP] not connected!\n");
+        return;
+    }
+    if(!_RXbuffer) {
+        DEBUG_ASYNC_TCP("[A-TCP] _rxData no _RXbuffer!\n");
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] _rxData len: %d RXmode: %d\n", len, _RXmode);
+
+    size_t handled = 0;
+
+    if(_RXmode != ATB_RX_MODE_NONE) {
+        handled = _handleRxBuffer((uint8_t *) buf, len);
+        buf += handled;
+        len -= handled;
+
+        // handle as much as possible before using the buffer
+        if(_RXbuffer->empty()) {
+            while(_RXmode != ATB_RX_MODE_NONE && handled != 0 && len > 0) {
+                handled = _handleRxBuffer(buf, len);
+                buf += handled;
+                len -= handled;
+            }
+        }
+    }
+
+    if(len > 0) {
+
+        if(_RXbuffer->room() < len) {
+            // to less space
+            DEBUG_ASYNC_TCP("[A-TCP] _rxData buffer full try resize\n");
+            _RXbuffer->resizeAdd((len + _RXbuffer->room()));
+
+            if(_RXbuffer->room() < len) {
+                DEBUG_ASYNC_TCP("[A-TCP] _rxData buffer to full can only handle %d!!!\n", _RXbuffer->room());
+            }
+        }
+
+        _RXbuffer->write((const char *) (buf), len);
+    }
+
+    if(!_RXbuffer->empty() && _RXmode != ATB_RX_MODE_NONE) {
+        // handle as much as possible data in buffer
+        handled = _handleRxBuffer(NULL, 0);
+        while(_RXmode != ATB_RX_MODE_NONE && handled != 0) {
+            handled = _handleRxBuffer(NULL, 0);
+        }
+    }
+
+    // clean up ram
+    if(_RXbuffer->empty() && _RXbuffer->room() != 100) {
+        _RXbuffer->resize(100);
+    }
+
+}
+
+/**
+ *
+ */
+size_t AsyncTCPbuffer::_handleRxBuffer(uint8_t *buf, size_t len) {
+    if(!_client || !_client->connected() || _RXbuffer == NULL) {
+        return 0;
+    }
+
+    DEBUG_ASYNC_TCP("[A-TCP] _handleRxBuffer len: %d RXmode: %d\n", len, _RXmode);
+
+    size_t BufferAvailable = _RXbuffer->available();
+    size_t r = 0;
+
+    if(_RXmode == ATB_RX_MODE_NONE) {
+        return 0;
+    } else if(_RXmode == ATB_RX_MODE_FREE) {
+        if(_cbRX == NULL) {
+            return 0;
+        }
+
+        if(BufferAvailable > 0) {
+            uint8_t * b = new uint8_t[BufferAvailable];
+            _RXbuffer->peek((char *) b, BufferAvailable);
+            r = _cbRX(b, BufferAvailable);
+            _RXbuffer->remove(r);
+        }
+
+        if(r == BufferAvailable && buf && (len > 0)) {
+            return _cbRX(buf, len);
+        } else {
+            return 0;
+        }
+
+    } else if(_RXmode == ATB_RX_MODE_READ_BYTES) {
+        if(_rxReadBytesPtr == NULL || _cbDone == NULL) {
+            return 0;
+        }
+
+        size_t newReadCount = 0;
+
+        if(BufferAvailable) {
+            r = _RXbuffer->read((char *) _rxReadBytesPtr, _rxSize);
+            _rxSize -= r;
+            _rxReadBytesPtr += r;
+        }
+
+        if(_RXbuffer->empty() && (len > 0) && buf) {
+            r = len;
+            if(r > _rxSize) {
+                r = _rxSize;
+            }
+            memcpy(_rxReadBytesPtr, buf, r);
+            _rxReadBytesPtr += r;
+            _rxSize -= r;
+            newReadCount += r;
+        }
+
+        if(_rxSize == 0) {
+            _RXmode = ATB_RX_MODE_NONE;
+            _cbDone(true, NULL);
+        }
+
+        // add left over bytes to Buffer
+        return newReadCount;
+
+    } else if(_RXmode == ATB_RX_MODE_TERMINATOR) {
+        // TODO implement read terminator non string
+
+    } else if(_RXmode == ATB_RX_MODE_TERMINATOR_STRING) {
+        if(_rxReadStringPtr == NULL || _cbDone == NULL) {
+            return 0;
+        }
+
+        // handle Buffer
+        if(BufferAvailable > 0) {
+            while(!_RXbuffer->empty()) {
+                char c = _RXbuffer->read();
+                if(c == _rxTerminator || c == 0x00) {
+                    _RXmode = ATB_RX_MODE_NONE;
+                    _cbDone(true, _rxReadStringPtr);
+                    return 0;
+                } else {
+                    (*_rxReadStringPtr) += c;
+                }
+            }
+        }
+
+        if(_RXbuffer->empty() && (len > 0) && buf) {
+            size_t newReadCount = 0;
+            while(newReadCount < len) {
+                char c = (char) *buf;
+                buf++;
+                newReadCount++;
+                if(c == _rxTerminator || c == 0x00) {
+                    _RXmode = ATB_RX_MODE_NONE;
+                    _cbDone(true, _rxReadStringPtr);
+                    return newReadCount;
+                } else {
+                    (*_rxReadStringPtr) += c;
+                }
+            }
+            return newReadCount;
+        }
+    }
+
+    return 0;
+}
+
diff --git a/src/ESPAsyncTCPbuffer.h b/src/ESPAsyncTCPbuffer.h
new file mode 100644
index 0000000..ab02ced
--- /dev/null
+++ b/src/ESPAsyncTCPbuffer.h
@@ -0,0 +1,117 @@
+/**
+ * @file ESPAsyncTCPbuffer.h
+ * @date  22.01.2016
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the Asynv TCP for ESP.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef ESPASYNCTCPBUFFER_H_
+#define ESPASYNCTCPBUFFER_H_
+
+//#define DEBUG_ASYNC_TCP(...)  while(((U0S >> USTXC) & 0x7F) != 0x00); os_printf( __VA_ARGS__ ); while(((U0S >> USTXC) & 0x7F) != 0x00)
+
+#ifndef DEBUG_ASYNC_TCP
+#define DEBUG_ASYNC_TCP(...)
+#endif
+
+#include <Arduino.h>
+#include <cbuf.h>
+
+#include "ESPAsyncTCP.h"
+
+
+
+typedef enum {
+    ATB_RX_MODE_NONE,
+    ATB_RX_MODE_FREE,
+    ATB_RX_MODE_READ_BYTES,
+    ATB_RX_MODE_TERMINATOR,
+    ATB_RX_MODE_TERMINATOR_STRING
+} atbRxMode_t;
+
+class AsyncTCPbuffer: public Print {
+
+    public:
+
+        typedef std::function<size_t(uint8_t * payload, size_t length)> AsyncTCPbufferDataCb;
+        typedef std::function<void(bool ok, void * ret)> AsyncTCPbufferDoneCb;
+        typedef std::function<bool(AsyncTCPbuffer * obj)> AsyncTCPbufferDisconnectCb;
+
+        AsyncTCPbuffer(AsyncClient* c);
+        ~AsyncTCPbuffer();
+
+        size_t write(String data);
+        size_t write(uint8_t data);
+        size_t write(const char* data);
+        size_t write(const char *data, size_t len);
+        size_t write(const uint8_t *data, size_t len);
+
+        void flush();
+
+        void noCallback();
+
+        void readStringUntil(char terminator, String * str, AsyncTCPbufferDoneCb done);
+
+        // TODO implement read terminator non string
+        //void readBytesUntil(char terminator, char *buffer, size_t length, AsyncTCPbufferDoneCb done);
+        //void readBytesUntil(char terminator, uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done);
+
+        void readBytes(char *buffer, size_t length, AsyncTCPbufferDoneCb done);
+        void readBytes(uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done);
+
+        // TODO implement
+        // void setTimeout(size_t timeout);
+
+        void onData(AsyncTCPbufferDataCb cb);
+        void onDisconnect(AsyncTCPbufferDisconnectCb cb);
+
+        IPAddress remoteIP();
+        uint16_t  remotePort();
+        IPAddress localIP();
+        uint16_t  localPort();
+
+        bool connected();
+
+        void stop();
+        void close();
+
+    protected:
+        AsyncClient* _client;
+        cbuf * _TXbuffer;
+        cbuf * _RXbuffer;
+        atbRxMode_t _RXmode;
+        size_t _rxSize;
+        char _rxTerminator;
+        uint8_t * _rxReadBytesPtr;
+        String * _rxReadStringPtr;
+
+        AsyncTCPbufferDataCb _cbRX;
+        AsyncTCPbufferDoneCb _cbDone;
+        AsyncTCPbufferDisconnectCb _cbDisconnect;
+
+        void _attachCallbacks();
+        void _sendBuffer();
+        void _on_close();
+        void _rxData(uint8_t *buf, size_t len);
+        size_t _handleRxBuffer(uint8_t *buf, size_t len);
+
+};
+
+#endif /* ESPASYNCTCPBUFFER_H_ */