diff --git a/.travis.yml b/.travis.yml
index 21c1028..6522aa4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,9 @@ os:
 language: python
 python:
     - 2.7
-    - 2.6
     - 3.6
+    - 3.5
+    - 3.4
 
 install:
     - python setup.py install
diff --git a/nhentai/utils.py b/nhentai/utils.py
index 4fd46ee..4e779e8 100644
--- a/nhentai/utils.py
+++ b/nhentai/utils.py
@@ -44,7 +44,7 @@ def generate_html(output_dir='.', doujinshi_obj=None):
 
     if doujinshi_obj is not None:
         doujinshi_dir = os.path.join(output_dir, format_filename('%s-%s' % (doujinshi_obj.id,
-                                                                            str(doujinshi_obj.name[:200]))))
+                                                                            doujinshi_obj.name)))
     else:
         doujinshi_dir = '.'
 
@@ -64,6 +64,8 @@ def generate_html(output_dir='.', doujinshi_obj=None):
 
     if doujinshi_obj is not None:
         title = doujinshi_obj.name
+        if sys.version_info < (3, 0):
+            title = title.encode('utf-8')
     else:
         title = 'nHentai HTML Viewer'