diff --git a/Dockerfile b/Dockerfile
index 1f21c71aa..9672a55b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update
 RUN apt-get install -y build-essential python-dev python-pip python-setuptools libjpeg-dev zlib1g-dev git libgit2-dev libffi-dev
 
 # Get application source from Github
-RUN git clone -b master --single-branch https://github.com/morpheus65535/bazarr.git /bazarr
+RUN git clone -b development --single-branch https://github.com/morpheus65535/bazarr.git /bazarr
 
 VOLUME /bazarr/data
 
diff --git a/list_subtitles.py b/list_subtitles.py
index 9c24b5353..d0e5c458b 100644
--- a/list_subtitles.py
+++ b/list_subtitles.py
@@ -11,7 +11,7 @@ from get_general_settings import *
 def list_subtitles(file):
     languages = []
     actual_subtitles = []
-    if os.path.exists(file):
+    if os.path.exists(file.encode('utf-8')):
         if os.path.splitext(file)[1] == '.mkv':
             try:
                 with open(file, 'rb') as f:
@@ -35,7 +35,7 @@ def list_subtitles(file):
 def store_subtitles(file):
     languages = []
     actual_subtitles = []
-    if os.path.exists(file):
+    if os.path.exists(file.encode('utf-8')):
         if os.path.splitext(file)[1] == '.mkv':
             try:
                 with open(file, 'rb') as f:
@@ -125,8 +125,4 @@ def new_scan_subtitles():
     c_db.close()
 
     for episode in episodes:
-        store_subtitles(path_replace(episode[0]))
-
-#full_scan_subtitles()
-#new_scan_subtitles()
-#list_missing_subtitles()
+        store_subtitles(path_replace(episode[0]))
\ No newline at end of file