diff --git a/AUTHORS.rst b/AUTHORS.rst
index 83361aebc..b7d583161 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -9,6 +9,7 @@ Contributors
 The following wonderful people contributed directly or indirectly to this project:
 
 - `Avanatiker <https://github.com/Avanatiker>`_
+- `Balduro <https://github.com/Balduro>`_
 - `bimmlerd <https://github.com/bimmlerd>`_
 - `ErgoZ Riftbit Vaper <https://github.com/ergoz>`_
 - `franciscod <https://github.com/franciscod>`_
diff --git a/telegram/updater.py b/telegram/updater.py
index 4be1aa269..a07c51137 100644
--- a/telegram/updater.py
+++ b/telegram/updater.py
@@ -91,12 +91,18 @@ class Updater:
         # Return the update queue so the main thread can insert updates
         return self.update_queue
 
-    def start_webhook(self, listen='127.0.0.1', port=80, url_path='', cert=None, key=None):
+    def start_webhook(self,
+                      listen='127.0.0.1',
+                      port=80,
+                      url_path='',
+                      cert=None,
+                      key=None):
         """
         Starts a small http server to listen for updates via webhook. If cert
         and key are not provided, the webhook will be started directly on
-        http://listen:port/url_path, so SSL can be handled by another application. Else,
-        the webhook will be started on https://listen:port/url_path
+        http://listen:port/url_path, so SSL can be handled by another
+        application. Else, the webhook will be started on
+        https://listen:port/url_path
 
         Args:
             listen (Optional[str]): IP-Address to listen on