diff --git a/setup.py b/setup.py
index 9031eda..c9e47c7 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,4 @@
+# pylint: disable=missing-docstring
 from setuptools import setup
 from telegram_messages_dump import __version__
 
diff --git a/telegram_messages_dump/__init__.py b/telegram_messages_dump/__init__.py
index 0d5b254..95eb881 100644
--- a/telegram_messages_dump/__init__.py
+++ b/telegram_messages_dump/__init__.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+# pylint: disable=missing-docstring
 
 __version__ = '0.4'
diff --git a/telegram_messages_dump/telegram_dumper.py b/telegram_messages_dump/telegram_dumper.py
index 707e0f0..29bcb7a 100644
--- a/telegram_messages_dump/telegram_dumper.py
+++ b/telegram_messages_dump/telegram_dumper.py
@@ -13,8 +13,11 @@
 from collections import deque
 from getpass import getpass
 from time import sleep
-from telethon import TelegramClient, sync
-from telethon.errors import FloodWaitError, SessionPasswordNeededError, UsernameNotOccupiedError, UsernameInvalidError
+from telethon import TelegramClient, sync # pylint: disable=unused-import
+from telethon.errors import (FloodWaitError,
+                             SessionPasswordNeededError,
+                             UsernameNotOccupiedError,
+                             UsernameInvalidError)
 from telethon.tl.functions.contacts import ResolveUsernameRequest
 from telegram_messages_dump.utils import sprint
 from telegram_messages_dump.utils import JOIN_CHAT_PREFIX_URL
@@ -33,6 +36,7 @@ def __init__(self, session_user_id, settings, metadata, exporter):
         super().__init__(session_user_id,
                          settings.api_id,
                          settings.api_hash,
+                         timeout=40, #seconds
                          proxy=None)
 
         # Settings as specified by user or defaults or from metadata