diff --git a/setup.py b/setup.py
index db0b52e..b252c63 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 import sys
 from os import name
diff --git a/youtube_dl_gui/DownloadObject.py b/youtube_dl_gui/DownloadObject.py
index aeef9f1..f45acaa 100644
--- a/youtube_dl_gui/DownloadObject.py
+++ b/youtube_dl_gui/DownloadObject.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 import subprocess
 
diff --git a/youtube_dl_gui/DownloadThread.py b/youtube_dl_gui/DownloadThread.py
index b95709f..4eb82a8 100644
--- a/youtube_dl_gui/DownloadThread.py
+++ b/youtube_dl_gui/DownloadThread.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 from time import sleep
 from threading import Thread
diff --git a/youtube_dl_gui/LogManager.py b/youtube_dl_gui/LogManager.py
index 0138e36..63bbec1 100644
--- a/youtube_dl_gui/LogManager.py
+++ b/youtube_dl_gui/LogManager.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 import wx
 
@@ -20,6 +20,7 @@ class LogManager(object):
         self.config_path = config_path
         self.add_time = add_time
         self.log_file = self._get_log_file()
+        self._init_log()
         self._auto_clear_log()
 
     def size(self):
@@ -42,6 +43,10 @@ class LogManager(object):
                 fl.write(t)
             fl.write(data)
 
+    def _init_log(self):
+        if not file_exist(self.log_file):
+            self._write('', 'w')
+            
     def _auto_clear_log(self):
         if self.size() > self.MAX_FILESIZE:
             self.clear()
diff --git a/youtube_dl_gui/OptionsHandler.py b/youtube_dl_gui/OptionsHandler.py
index d5af9b6..f898c0e 100644
--- a/youtube_dl_gui/OptionsHandler.py
+++ b/youtube_dl_gui/OptionsHandler.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 import json
 
diff --git a/youtube_dl_gui/UpdateThread.py b/youtube_dl_gui/UpdateThread.py
index 43edd77..2369c78 100644
--- a/youtube_dl_gui/UpdateThread.py
+++ b/youtube_dl_gui/UpdateThread.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 from wx import CallAfter
 from wx.lib.pubsub import setuparg1
diff --git a/youtube_dl_gui/Utils.py b/youtube_dl_gui/Utils.py
index 0657b8a..321bf69 100644
--- a/youtube_dl_gui/Utils.py
+++ b/youtube_dl_gui/Utils.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 import os
 import sys
diff --git a/youtube_dl_gui/YDLOptionsParser.py b/youtube_dl_gui/YDLOptionsParser.py
index 5cab818..4b294dd 100644
--- a/youtube_dl_gui/YDLOptionsParser.py
+++ b/youtube_dl_gui/YDLOptionsParser.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 from .Utils import (
     video_is_dash,
diff --git a/youtube_dl_gui/YoutubeDLGUI.py b/youtube_dl_gui/YoutubeDLGUI.py
index e6d087f..78fe882 100644
--- a/youtube_dl_gui/YoutubeDLGUI.py
+++ b/youtube_dl_gui/YoutubeDLGUI.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 from time import time
 
@@ -332,6 +332,8 @@ class MainFrame(wx.Frame):
         if self.download_thread is not None:
             self.download_thread.close(kill=True)
             self.download_thread.join()
+        if self.update_thread is not None:
+            self.update_thread.join()
         self.save_options()
         self.Destroy()
 
diff --git a/youtube_dl_gui/__init__.py b/youtube_dl_gui/__init__.py
index 74579f9..0c339e7 100644
--- a/youtube_dl_gui/__init__.py
+++ b/youtube_dl_gui/__init__.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 from sys import exit
 
diff --git a/youtube_dl_gui/__main__.py b/youtube_dl_gui/__main__.py
index 641ccb7..66758fb 100644
--- a/youtube_dl_gui/__main__.py
+++ b/youtube_dl_gui/__main__.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python2
 
 import sys