diff --git a/PKG-INFO b/PKG-INFO
index 733cf56..7714efd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -4,187 +4,6 @@ Version: 5.3.1
 Summary: InfluxDB client
 Home-page: https://github.com/influxdb/influxdb-python
 License: MIT License
-Description: InfluxDB-Python
-        ===============
-        
-        .. image:: https://travis-ci.org/influxdata/influxdb-python.svg?branch=master
-            :target: https://travis-ci.org/influxdata/influxdb-python
-        .. image:: https://readthedocs.org/projects/influxdb-python/badge/?version=latest&style
-            :target: http://influxdb-python.readthedocs.org/
-            :alt: Documentation Status
-        
-        .. image:: https://img.shields.io/coveralls/influxdata/influxdb-python.svg
-          :target: https://coveralls.io/r/influxdata/influxdb-python
-          :alt: Coverage
-        
-        .. image:: https://img.shields.io/pypi/v/influxdb.svg
-           :target: https://pypi.python.org/pypi/influxdb
-           :alt: PyPI Status
-        
-        InfluxDB-Python is a client for interacting with InfluxDB_.
-        
-        Development of this library is maintained by:
-        
-        +-----------+-------------------------------+
-        | Github ID | URL                           |
-        +===========+===============================+
-        | @aviau    | (https://github.com/aviau)    |
-        +-----------+-------------------------------+
-        | @xginn8   | (https://github.com/xginn8)   |
-        +-----------+-------------------------------+
-        | @sebito91 | (https://github.com/sebito91) |
-        +-----------+-------------------------------+
-        
-        .. _readme-about:
-        
-        InfluxDB is an open-source distributed time series database, find more about InfluxDB_ at https://docs.influxdata.com/influxdb/latest
-        
-        
-        .. _installation:
-        
-        InfluxDB pre v1.1.0 users
-        -------------------------
-        
-        This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3, v1.5.4, v1.6.4, and 1.7.4.
-        
-        Those users still on InfluxDB v0.8.x users may still use the legacy client by importing ``from influxdb.influxdb08 import InfluxDBClient``.
-        
-        Installation
-        ------------
-        
-        Install, upgrade and uninstall influxdb-python with these commands::
-        
-            $ pip install influxdb
-            $ pip install --upgrade influxdb
-            $ pip uninstall influxdb
-        
-        On Debian/Ubuntu, you can install it with this command::
-        
-            $ sudo apt-get install python-influxdb
-        
-        Dependencies
-        ------------
-        
-        The influxdb-python distribution is supported and tested on Python 2.7, 3.5, 3.6, 3.7, PyPy and PyPy3.
-        
-        **Note:** Python <3.5 are currently untested. See ``.travis.yml``.
-        
-        Main dependency is:
-        
-        - Requests: HTTP library for human beings (http://docs.python-requests.org/)
-        
-        
-        Additional dependencies are:
-        
-        - pandas: for writing from and reading to DataFrames (http://pandas.pydata.org/)
-        - Sphinx: Tool to create and manage the documentation (http://sphinx-doc.org/)
-        - Nose: to auto-discover tests (http://nose.readthedocs.org/en/latest/)
-        - Mock: to mock tests (https://pypi.python.org/pypi/mock)
-        
-        
-        Documentation
-        -------------
-        
-        Documentation is available at https://influxdb-python.readthedocs.io/en/latest/.
-        
-        You will need Sphinx_ installed to generate the documentation.
-        
-        The documentation can be generated by running::
-        
-            $ tox -e docs
-        
-        
-        Generated documentation can be found in the *docs/build/html/* directory.
-        
-        
-        Examples
-        --------
-        
-        Here's a basic example (for more see the examples directory)::
-        
-            $ python
-        
-            >>> from influxdb import InfluxDBClient
-        
-            >>> json_body = [
-                {
-                    "measurement": "cpu_load_short",
-                    "tags": {
-                        "host": "server01",
-                        "region": "us-west"
-                    },
-                    "time": "2009-11-10T23:00:00Z",
-                    "fields": {
-                        "value": 0.64
-                    }
-                }
-            ]
-        
-            >>> client = InfluxDBClient('localhost', 8086, 'root', 'root', 'example')
-        
-            >>> client.create_database('example')
-        
-            >>> client.write_points(json_body)
-        
-            >>> result = client.query('select value from cpu_load_short;')
-        
-            >>> print("Result: {0}".format(result))
-        
-        
-        Testing
-        -------
-        
-        Make sure you have tox by running the following::
-        
-            $ pip install tox
-        
-        To test influxdb-python with multiple version of Python, you can use Tox_::
-        
-            $ tox
-        
-        
-        Support
-        -------
-        
-        For issues with, questions about, or feedback for InfluxDB_, please look into
-        our community page: http://influxdb.com/community/.
-        
-        We are also lurking on the following:
-        
-        - #influxdb on irc.freenode.net
-        - #influxdb on gophers.slack.com
-        
-        
-        Development
-        -----------
-        
-        All development is done on Github_. Use Issues_ to report
-        problems or submit contributions.
-        
-        .. _Github: https://github.com/influxdb/influxdb-python/
-        .. _Issues: https://github.com/influxdb/influxdb-python/issues
-        
-        Please note that we WILL get to your questions/issues/concerns as quickly as possible. We maintain many
-        software repositories and sometimes things may get pushed to the backburner. Please don't take offense,
-        we will do our best to reply as soon as possible!
-        
-        
-        Source code
-        -----------
-        
-        The source code is currently available on Github: https://github.com/influxdata/influxdb-python
-        
-        
-        TODO
-        ----
-        
-        The TODO/Roadmap can be found in Github bug tracker: https://github.com/influxdata/influxdb-python/issues
-        
-        
-        .. _InfluxDB: https://influxdata.com/time-series-platform/influxdb/
-        .. _Sphinx: http://sphinx.pocoo.org/
-        .. _Tox: https://tox.readthedocs.org
-        
 Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -199,3 +18,189 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: test
+License-File: LICENSE
+
+InfluxDB-Python
+===============
+
+.. image:: https://travis-ci.org/influxdata/influxdb-python.svg?branch=master
+    :target: https://travis-ci.org/influxdata/influxdb-python
+.. image:: https://readthedocs.org/projects/influxdb-python/badge/?version=latest&style
+    :target: http://influxdb-python.readthedocs.org/
+    :alt: Documentation Status
+
+.. image:: https://img.shields.io/coveralls/influxdata/influxdb-python.svg
+  :target: https://coveralls.io/r/influxdata/influxdb-python
+  :alt: Coverage
+
+.. image:: https://img.shields.io/pypi/v/influxdb.svg
+   :target: https://pypi.python.org/pypi/influxdb
+   :alt: PyPI Status
+
+InfluxDB-Python is a client for interacting with InfluxDB_.
+
+**Note: This library is for use with InfluxDB 1.x. For connecting to InfluxDB 2.x instances, please use the the** `influxdb-client-python <https://github.com/influxdata/influxdb-client-python>`_ **client.**
+
+Development of this library is maintained by:
+
++-----------+-------------------------------+
+| Github ID | URL                           |
++===========+===============================+
+| @aviau    | (https://github.com/aviau)    |
++-----------+-------------------------------+
+| @xginn8   | (https://github.com/xginn8)   |
++-----------+-------------------------------+
+| @sebito91 | (https://github.com/sebito91) |
++-----------+-------------------------------+
+
+.. _readme-about:
+
+InfluxDB is an open-source distributed time series database, find more about InfluxDB_ at https://docs.influxdata.com/influxdb/latest
+
+
+.. _installation:
+
+InfluxDB pre v1.1.0 users
+-------------------------
+
+This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3, v1.5.4, v1.6.4, and 1.7.4.
+
+Those users still on InfluxDB v0.8.x users may still use the legacy client by importing ``from influxdb.influxdb08 import InfluxDBClient``.
+
+Installation
+------------
+
+Install, upgrade and uninstall influxdb-python with these commands::
+
+    $ pip install influxdb
+    $ pip install --upgrade influxdb
+    $ pip uninstall influxdb
+
+On Debian/Ubuntu, you can install it with this command::
+
+    $ sudo apt-get install python-influxdb
+
+Dependencies
+------------
+
+The influxdb-python distribution is supported and tested on Python 2.7, 3.5, 3.6, 3.7, PyPy and PyPy3.
+
+**Note:** Python <3.5 are currently untested. See ``.travis.yml``.
+
+Main dependency is:
+
+- Requests: HTTP library for human beings (http://docs.python-requests.org/)
+
+
+Additional dependencies are:
+
+- pandas: for writing from and reading to DataFrames (http://pandas.pydata.org/)
+- Sphinx: Tool to create and manage the documentation (http://sphinx-doc.org/)
+- Nose: to auto-discover tests (http://nose.readthedocs.org/en/latest/)
+- Mock: to mock tests (https://pypi.python.org/pypi/mock)
+
+
+Documentation
+-------------
+
+Documentation is available at https://influxdb-python.readthedocs.io/en/latest/.
+
+You will need Sphinx_ installed to generate the documentation.
+
+The documentation can be generated by running::
+
+    $ tox -e docs
+
+
+Generated documentation can be found in the *docs/build/html/* directory.
+
+
+Examples
+--------
+
+Here's a basic example (for more see the examples directory)::
+
+    $ python
+
+    >>> from influxdb import InfluxDBClient
+
+    >>> json_body = [
+        {
+            "measurement": "cpu_load_short",
+            "tags": {
+                "host": "server01",
+                "region": "us-west"
+            },
+            "time": "2009-11-10T23:00:00Z",
+            "fields": {
+                "value": 0.64
+            }
+        }
+    ]
+
+    >>> client = InfluxDBClient('localhost', 8086, 'root', 'root', 'example')
+
+    >>> client.create_database('example')
+
+    >>> client.write_points(json_body)
+
+    >>> result = client.query('select value from cpu_load_short;')
+
+    >>> print("Result: {0}".format(result))
+
+
+Testing
+-------
+
+Make sure you have tox by running the following::
+
+    $ pip install tox
+
+To test influxdb-python with multiple version of Python, you can use Tox_::
+
+    $ tox
+
+
+Support
+-------
+
+For issues with, questions about, or feedback for InfluxDB_, please look into
+our community page: http://influxdb.com/community/.
+
+We are also lurking on the following:
+
+- #influxdb on irc.freenode.net
+- #influxdb on gophers.slack.com
+
+
+Development
+-----------
+
+All development is done on Github_. Use Issues_ to report
+problems or submit contributions.
+
+.. _Github: https://github.com/influxdb/influxdb-python/
+.. _Issues: https://github.com/influxdb/influxdb-python/issues
+
+Please note that we WILL get to your questions/issues/concerns as quickly as possible. We maintain many
+software repositories and sometimes things may get pushed to the backburner. Please don't take offense,
+we will do our best to reply as soon as possible!
+
+
+Source code
+-----------
+
+The source code is currently available on Github: https://github.com/influxdata/influxdb-python
+
+
+TODO
+----
+
+The TODO/Roadmap can be found in Github bug tracker: https://github.com/influxdata/influxdb-python/issues
+
+
+.. _InfluxDB: https://influxdata.com/time-series-platform/influxdb/
+.. _Sphinx: http://sphinx.pocoo.org/
+.. _Tox: https://tox.readthedocs.org
+
+
diff --git a/README.rst b/README.rst
index a40ed14..01e054e 100644
--- a/README.rst
+++ b/README.rst
@@ -17,6 +17,8 @@ InfluxDB-Python
 
 InfluxDB-Python is a client for interacting with InfluxDB_.
 
+**Note: This library is for use with InfluxDB 1.x. For connecting to InfluxDB 2.x instances, please use the the** `influxdb-client-python <https://github.com/influxdata/influxdb-client-python>`_ **client.**
+
 Development of this library is maintained by:
 
 +-----------+-------------------------------+
diff --git a/debian/changelog b/debian/changelog
index 1f55088..f6ad015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-influxdb-python (5.3.1-3) UNRELEASED; urgency=medium
+influxdb-python (5.3.1+git20210908.1.7cb5656-1) UNRELEASED; urgency=medium
 
   * Bump debhelper from old 12 to 13.
   * Update standards version to 4.5.1, no changes needed.
   * Remove constraints unnecessary since buster:
     + Build-Depends-Indep: Drop versioned constraint on python3-requests-mock.
+  * New upstream snapshot.
 
- -- Debian Janitor <janitor@jelmer.uk>  Wed, 25 Aug 2021 19:38:31 -0000
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 15 Apr 2022 07:34:44 -0000
 
 influxdb-python (5.3.1-2) unstable; urgency=medium
 
diff --git a/debian/patches/remove-broken-test.patch b/debian/patches/remove-broken-test.patch
index 519cdaf..0880f17 100644
--- a/debian/patches/remove-broken-test.patch
+++ b/debian/patches/remove-broken-test.patch
@@ -4,8 +4,10 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
 Last-Update: 2021-03-23
 
---- influxdb-python-5.3.1.orig/influxdb/tests/dataframe_client_test.py
-+++ influxdb-python-5.3.1/influxdb/tests/dataframe_client_test.py
+Index: influxdb-python/influxdb/tests/dataframe_client_test.py
+===================================================================
+--- influxdb-python.orig/influxdb/tests/dataframe_client_test.py
++++ influxdb-python/influxdb/tests/dataframe_client_test.py
 @@ -1210,38 +1210,6 @@ class TestDataFrameClient(unittest.TestC
                               tag_columns=['tag_one', 'tag_two'])
              self.assertEqual(m.last_request.body, expected)
diff --git a/influxdb.egg-info/PKG-INFO b/influxdb.egg-info/PKG-INFO
index 733cf56..7714efd 100644
--- a/influxdb.egg-info/PKG-INFO
+++ b/influxdb.egg-info/PKG-INFO
@@ -4,187 +4,6 @@ Version: 5.3.1
 Summary: InfluxDB client
 Home-page: https://github.com/influxdb/influxdb-python
 License: MIT License
-Description: InfluxDB-Python
-        ===============
-        
-        .. image:: https://travis-ci.org/influxdata/influxdb-python.svg?branch=master
-            :target: https://travis-ci.org/influxdata/influxdb-python
-        .. image:: https://readthedocs.org/projects/influxdb-python/badge/?version=latest&style
-            :target: http://influxdb-python.readthedocs.org/
-            :alt: Documentation Status
-        
-        .. image:: https://img.shields.io/coveralls/influxdata/influxdb-python.svg
-          :target: https://coveralls.io/r/influxdata/influxdb-python
-          :alt: Coverage
-        
-        .. image:: https://img.shields.io/pypi/v/influxdb.svg
-           :target: https://pypi.python.org/pypi/influxdb
-           :alt: PyPI Status
-        
-        InfluxDB-Python is a client for interacting with InfluxDB_.
-        
-        Development of this library is maintained by:
-        
-        +-----------+-------------------------------+
-        | Github ID | URL                           |
-        +===========+===============================+
-        | @aviau    | (https://github.com/aviau)    |
-        +-----------+-------------------------------+
-        | @xginn8   | (https://github.com/xginn8)   |
-        +-----------+-------------------------------+
-        | @sebito91 | (https://github.com/sebito91) |
-        +-----------+-------------------------------+
-        
-        .. _readme-about:
-        
-        InfluxDB is an open-source distributed time series database, find more about InfluxDB_ at https://docs.influxdata.com/influxdb/latest
-        
-        
-        .. _installation:
-        
-        InfluxDB pre v1.1.0 users
-        -------------------------
-        
-        This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3, v1.5.4, v1.6.4, and 1.7.4.
-        
-        Those users still on InfluxDB v0.8.x users may still use the legacy client by importing ``from influxdb.influxdb08 import InfluxDBClient``.
-        
-        Installation
-        ------------
-        
-        Install, upgrade and uninstall influxdb-python with these commands::
-        
-            $ pip install influxdb
-            $ pip install --upgrade influxdb
-            $ pip uninstall influxdb
-        
-        On Debian/Ubuntu, you can install it with this command::
-        
-            $ sudo apt-get install python-influxdb
-        
-        Dependencies
-        ------------
-        
-        The influxdb-python distribution is supported and tested on Python 2.7, 3.5, 3.6, 3.7, PyPy and PyPy3.
-        
-        **Note:** Python <3.5 are currently untested. See ``.travis.yml``.
-        
-        Main dependency is:
-        
-        - Requests: HTTP library for human beings (http://docs.python-requests.org/)
-        
-        
-        Additional dependencies are:
-        
-        - pandas: for writing from and reading to DataFrames (http://pandas.pydata.org/)
-        - Sphinx: Tool to create and manage the documentation (http://sphinx-doc.org/)
-        - Nose: to auto-discover tests (http://nose.readthedocs.org/en/latest/)
-        - Mock: to mock tests (https://pypi.python.org/pypi/mock)
-        
-        
-        Documentation
-        -------------
-        
-        Documentation is available at https://influxdb-python.readthedocs.io/en/latest/.
-        
-        You will need Sphinx_ installed to generate the documentation.
-        
-        The documentation can be generated by running::
-        
-            $ tox -e docs
-        
-        
-        Generated documentation can be found in the *docs/build/html/* directory.
-        
-        
-        Examples
-        --------
-        
-        Here's a basic example (for more see the examples directory)::
-        
-            $ python
-        
-            >>> from influxdb import InfluxDBClient
-        
-            >>> json_body = [
-                {
-                    "measurement": "cpu_load_short",
-                    "tags": {
-                        "host": "server01",
-                        "region": "us-west"
-                    },
-                    "time": "2009-11-10T23:00:00Z",
-                    "fields": {
-                        "value": 0.64
-                    }
-                }
-            ]
-        
-            >>> client = InfluxDBClient('localhost', 8086, 'root', 'root', 'example')
-        
-            >>> client.create_database('example')
-        
-            >>> client.write_points(json_body)
-        
-            >>> result = client.query('select value from cpu_load_short;')
-        
-            >>> print("Result: {0}".format(result))
-        
-        
-        Testing
-        -------
-        
-        Make sure you have tox by running the following::
-        
-            $ pip install tox
-        
-        To test influxdb-python with multiple version of Python, you can use Tox_::
-        
-            $ tox
-        
-        
-        Support
-        -------
-        
-        For issues with, questions about, or feedback for InfluxDB_, please look into
-        our community page: http://influxdb.com/community/.
-        
-        We are also lurking on the following:
-        
-        - #influxdb on irc.freenode.net
-        - #influxdb on gophers.slack.com
-        
-        
-        Development
-        -----------
-        
-        All development is done on Github_. Use Issues_ to report
-        problems or submit contributions.
-        
-        .. _Github: https://github.com/influxdb/influxdb-python/
-        .. _Issues: https://github.com/influxdb/influxdb-python/issues
-        
-        Please note that we WILL get to your questions/issues/concerns as quickly as possible. We maintain many
-        software repositories and sometimes things may get pushed to the backburner. Please don't take offense,
-        we will do our best to reply as soon as possible!
-        
-        
-        Source code
-        -----------
-        
-        The source code is currently available on Github: https://github.com/influxdata/influxdb-python
-        
-        
-        TODO
-        ----
-        
-        The TODO/Roadmap can be found in Github bug tracker: https://github.com/influxdata/influxdb-python/issues
-        
-        
-        .. _InfluxDB: https://influxdata.com/time-series-platform/influxdb/
-        .. _Sphinx: http://sphinx.pocoo.org/
-        .. _Tox: https://tox.readthedocs.org
-        
 Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -199,3 +18,189 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: test
+License-File: LICENSE
+
+InfluxDB-Python
+===============
+
+.. image:: https://travis-ci.org/influxdata/influxdb-python.svg?branch=master
+    :target: https://travis-ci.org/influxdata/influxdb-python
+.. image:: https://readthedocs.org/projects/influxdb-python/badge/?version=latest&style
+    :target: http://influxdb-python.readthedocs.org/
+    :alt: Documentation Status
+
+.. image:: https://img.shields.io/coveralls/influxdata/influxdb-python.svg
+  :target: https://coveralls.io/r/influxdata/influxdb-python
+  :alt: Coverage
+
+.. image:: https://img.shields.io/pypi/v/influxdb.svg
+   :target: https://pypi.python.org/pypi/influxdb
+   :alt: PyPI Status
+
+InfluxDB-Python is a client for interacting with InfluxDB_.
+
+**Note: This library is for use with InfluxDB 1.x. For connecting to InfluxDB 2.x instances, please use the the** `influxdb-client-python <https://github.com/influxdata/influxdb-client-python>`_ **client.**
+
+Development of this library is maintained by:
+
++-----------+-------------------------------+
+| Github ID | URL                           |
++===========+===============================+
+| @aviau    | (https://github.com/aviau)    |
++-----------+-------------------------------+
+| @xginn8   | (https://github.com/xginn8)   |
++-----------+-------------------------------+
+| @sebito91 | (https://github.com/sebito91) |
++-----------+-------------------------------+
+
+.. _readme-about:
+
+InfluxDB is an open-source distributed time series database, find more about InfluxDB_ at https://docs.influxdata.com/influxdb/latest
+
+
+.. _installation:
+
+InfluxDB pre v1.1.0 users
+-------------------------
+
+This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3, v1.5.4, v1.6.4, and 1.7.4.
+
+Those users still on InfluxDB v0.8.x users may still use the legacy client by importing ``from influxdb.influxdb08 import InfluxDBClient``.
+
+Installation
+------------
+
+Install, upgrade and uninstall influxdb-python with these commands::
+
+    $ pip install influxdb
+    $ pip install --upgrade influxdb
+    $ pip uninstall influxdb
+
+On Debian/Ubuntu, you can install it with this command::
+
+    $ sudo apt-get install python-influxdb
+
+Dependencies
+------------
+
+The influxdb-python distribution is supported and tested on Python 2.7, 3.5, 3.6, 3.7, PyPy and PyPy3.
+
+**Note:** Python <3.5 are currently untested. See ``.travis.yml``.
+
+Main dependency is:
+
+- Requests: HTTP library for human beings (http://docs.python-requests.org/)
+
+
+Additional dependencies are:
+
+- pandas: for writing from and reading to DataFrames (http://pandas.pydata.org/)
+- Sphinx: Tool to create and manage the documentation (http://sphinx-doc.org/)
+- Nose: to auto-discover tests (http://nose.readthedocs.org/en/latest/)
+- Mock: to mock tests (https://pypi.python.org/pypi/mock)
+
+
+Documentation
+-------------
+
+Documentation is available at https://influxdb-python.readthedocs.io/en/latest/.
+
+You will need Sphinx_ installed to generate the documentation.
+
+The documentation can be generated by running::
+
+    $ tox -e docs
+
+
+Generated documentation can be found in the *docs/build/html/* directory.
+
+
+Examples
+--------
+
+Here's a basic example (for more see the examples directory)::
+
+    $ python
+
+    >>> from influxdb import InfluxDBClient
+
+    >>> json_body = [
+        {
+            "measurement": "cpu_load_short",
+            "tags": {
+                "host": "server01",
+                "region": "us-west"
+            },
+            "time": "2009-11-10T23:00:00Z",
+            "fields": {
+                "value": 0.64
+            }
+        }
+    ]
+
+    >>> client = InfluxDBClient('localhost', 8086, 'root', 'root', 'example')
+
+    >>> client.create_database('example')
+
+    >>> client.write_points(json_body)
+
+    >>> result = client.query('select value from cpu_load_short;')
+
+    >>> print("Result: {0}".format(result))
+
+
+Testing
+-------
+
+Make sure you have tox by running the following::
+
+    $ pip install tox
+
+To test influxdb-python with multiple version of Python, you can use Tox_::
+
+    $ tox
+
+
+Support
+-------
+
+For issues with, questions about, or feedback for InfluxDB_, please look into
+our community page: http://influxdb.com/community/.
+
+We are also lurking on the following:
+
+- #influxdb on irc.freenode.net
+- #influxdb on gophers.slack.com
+
+
+Development
+-----------
+
+All development is done on Github_. Use Issues_ to report
+problems or submit contributions.
+
+.. _Github: https://github.com/influxdb/influxdb-python/
+.. _Issues: https://github.com/influxdb/influxdb-python/issues
+
+Please note that we WILL get to your questions/issues/concerns as quickly as possible. We maintain many
+software repositories and sometimes things may get pushed to the backburner. Please don't take offense,
+we will do our best to reply as soon as possible!
+
+
+Source code
+-----------
+
+The source code is currently available on Github: https://github.com/influxdata/influxdb-python
+
+
+TODO
+----
+
+The TODO/Roadmap can be found in Github bug tracker: https://github.com/influxdata/influxdb-python/issues
+
+
+.. _InfluxDB: https://influxdata.com/time-series-platform/influxdb/
+.. _Sphinx: http://sphinx.pocoo.org/
+.. _Tox: https://tox.readthedocs.org
+
+
diff --git a/influxdb.egg-info/requires.txt b/influxdb.egg-info/requires.txt
index 0d760f1..bd5d8dc 100644
--- a/influxdb.egg-info/requires.txt
+++ b/influxdb.egg-info/requires.txt
@@ -1,11 +1,11 @@
+msgpack
 python-dateutil>=2.6.0
 pytz
 requests>=2.17.0
 six>=1.10.0
-msgpack
 
 [test]
+mock
 nose
 nose-cov
-mock
 requests-mock
diff --git a/influxdb/client.py b/influxdb/client.py
index 51a64ac..adab4ed 100644
--- a/influxdb/client.py
+++ b/influxdb/client.py
@@ -20,6 +20,7 @@ from itertools import chain, islice
 import msgpack
 import requests
 import requests.exceptions
+from requests.adapters import HTTPAdapter
 from six.moves.urllib.parse import urlparse
 
 from influxdb.line_protocol import make_lines, quote_ident, quote_literal
@@ -87,6 +88,11 @@ class InfluxDBClient(object):
     :param headers: headers to add to Requests, will add 'Content-Type'
         and 'Accept' unless these are already present, defaults to {}
     :type headers: dict
+    :param socket_options: use custom tcp socket options,
+        If not specified, then defaults are loaded from
+        ``HTTPConnection.default_socket_options``
+    :type socket_options: list
+
     :raises ValueError: if cert is provided but ssl is disabled (set to False)
     """
 
@@ -109,6 +115,7 @@ class InfluxDBClient(object):
                  gzip=False,
                  session=None,
                  headers=None,
+                 socket_options=None,
                  ):
         """Construct a new InfluxDBClient object."""
         self.__host = host
@@ -128,9 +135,10 @@ class InfluxDBClient(object):
             session = requests.Session()
 
         self._session = session
-        adapter = requests.adapters.HTTPAdapter(
+        adapter = _SocketOptionsAdapter(
             pool_connections=int(pool_size),
-            pool_maxsize=int(pool_size)
+            pool_maxsize=int(pool_size),
+            socket_options=socket_options
         )
 
         if use_udp:
@@ -179,7 +187,7 @@ class InfluxDBClient(object):
 
     def __enter__(self):
         """Enter function as used by context manager."""
-        pass
+        return self
 
     def __exit__(self, _exc_type, _exc_value, _traceback):
         """Exit function as used by context manager."""
@@ -328,7 +336,10 @@ class InfluxDBClient(object):
         _try = 0
         while retry:
             try:
-                auth = (self._username, self._password)
+                if "Authorization" in headers:
+                    auth = (None, None)
+                else:
+                    auth = (self._username, self._password)
                 response = self._session.request(
                     method=method,
                     url=url,
@@ -626,7 +637,7 @@ class InfluxDBClient(object):
         # http://code.activestate.com/recipes/303279-getting-items-in-batches/
         iterator = iter(iterable)
         while True:
-            try:        # Try get the first element in the iterator...
+            try:  # Try get the first element in the iterator...
                 head = (next(iterator),)
             except StopIteration:
                 return  # ...so that we can stop if there isn't one
@@ -1249,3 +1260,16 @@ def _msgpack_parse_hook(code, data):
         timestamp += datetime.timedelta(microseconds=(epoch_ns / 1000))
         return timestamp.isoformat() + 'Z'
     return msgpack.ExtType(code, data)
+
+
+class _SocketOptionsAdapter(HTTPAdapter):
+    """_SocketOptionsAdapter injects socket_options into HTTP Adapter."""
+
+    def __init__(self, *args, **kwargs):
+        self.socket_options = kwargs.pop("socket_options", None)
+        super(_SocketOptionsAdapter, self).__init__(*args, **kwargs)
+
+    def init_poolmanager(self, *args, **kwargs):
+        if self.socket_options is not None:
+            kwargs["socket_options"] = self.socket_options
+        super(_SocketOptionsAdapter, self).init_poolmanager(*args, **kwargs)
diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py
index e511ca9..115fbc4 100644
--- a/influxdb/tests/client_test.py
+++ b/influxdb/tests/client_test.py
@@ -33,6 +33,7 @@ import requests.exceptions
 import requests_mock
 
 from nose.tools import raises
+from urllib3.connection import HTTPConnection
 
 from influxdb import InfluxDBClient
 from influxdb.resultset import ResultSet
@@ -1398,7 +1399,7 @@ class TestInfluxDBClient(unittest.TestCase):
             InfluxDBClient('host', '80/redir', 'username', 'password')
 
     def test_chunked_response(self):
-        """Test chunked reponse for TestInfluxDBClient object."""
+        """Test chunked response for TestInfluxDBClient object."""
         example_response = \
             u'{"results":[{"statement_id":0,"series":[{"columns":["key"],' \
             '"values":[["cpu"],["memory"],["iops"],["network"]],"partial":' \
@@ -1498,6 +1499,40 @@ class TestInfluxDBClient(unittest.TestCase):
             self.assertEqual(m.last_request.headers["Authorization"],
                              "my-token")
 
+    def test_custom_socket_options(self):
+        """Test custom socket options."""
+        test_socket_options = HTTPConnection.default_socket_options + \
+            [(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
+             (socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 60),
+             (socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 15)]
+
+        cli = InfluxDBClient(username=None, password=None,
+                             socket_options=test_socket_options)
+
+        self.assertEquals(cli._session.adapters.get("http://").socket_options,
+                          test_socket_options)
+        self.assertEquals(cli._session.adapters.get("http://").poolmanager.
+                          connection_pool_kw.get("socket_options"),
+                          test_socket_options)
+
+        connection_pool = cli._session.adapters.get("http://").poolmanager \
+            .connection_from_url(
+            url="http://localhost:8086")
+        new_connection = connection_pool._new_conn()
+        self.assertEquals(new_connection.socket_options, test_socket_options)
+
+    def test_none_socket_options(self):
+        """Test default socket options."""
+        cli = InfluxDBClient(username=None, password=None)
+        self.assertEquals(cli._session.adapters.get("http://").socket_options,
+                          None)
+        connection_pool = cli._session.adapters.get("http://").poolmanager \
+            .connection_from_url(
+            url="http://localhost:8086")
+        new_connection = connection_pool._new_conn()
+        self.assertEquals(new_connection.socket_options,
+                          HTTPConnection.default_socket_options)
+
 
 class FakeClient(InfluxDBClient):
     """Set up a fake client instance of InfluxDBClient."""