diff --git a/nhentai/command.py b/nhentai/command.py
index 4614f78..81e3053 100644
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python2.7
 #coding: utf-8
 
-from nhentai.cmdline import cmd_parser, banner
-from nhentai.parser import dojinshi_parser, search_parser, print_dojinshi
-from nhentai.dojinshi import Dojinshi
-from nhentai.downloader import Downloader
-from nhentai.logger import logger
+from cmdline import cmd_parser, banner
+from parser import dojinshi_parser, search_parser, print_dojinshi
+from dojinshi import Dojinshi
+from downloader import Downloader
+from logger import logger
 
 
 __version__ = '0.1'
diff --git a/nhentai/dojinshi.py b/nhentai/dojinshi.py
index 833d75a..baeb206 100644
--- a/nhentai/dojinshi.py
+++ b/nhentai/dojinshi.py
@@ -1,6 +1,6 @@
 import Queue
 from constant import DETAIL_URL, IMAGE_URL
-from nhentai.logger import logger
+from logger import logger
 
 
 class Dojinshi(object):
diff --git a/nhentai/downloader.py b/nhentai/downloader.py
index d05e84e..76dbb62 100644
--- a/nhentai/downloader.py
+++ b/nhentai/downloader.py
@@ -6,11 +6,12 @@ import threading
 import Queue
 import requests
 from urlparse import urlparse
-from nhentai.logger import logger
+from logger import logger
 
 
 # global timeout
 timeout = 30
+THREAD_TIMEOUT = 99999
 socket.setdefaulttimeout(timeout)
 
 
@@ -89,7 +90,7 @@ class Downloader(object):
 
         while len(self.threads) > 0:
             try:
-                self.threads = [t.join(1) for t in self.threads if t is not None and t.isAlive()]
+                self.threads = [t.join(THREAD_TIMEOUT) for t in self.threads if t and t.isAlive()]
             except KeyboardInterrupt:
                 logger.warning('Ctrl-C received, sending kill signal.')
                 self.kill_received = True
diff --git a/nhentai/parser.py b/nhentai/parser.py
index fdd8d3f..32477cf 100644
--- a/nhentai/parser.py
+++ b/nhentai/parser.py
@@ -3,7 +3,7 @@ import re
 import requests
 from bs4 import BeautifulSoup
 from constant import DETAIL_URL, SEARCH_URL
-from nhentai.logger import logger
+from logger import logger
 
 
 def dojinshi_parser(id):