diff --git a/jet/dashboard/models.py b/jet/dashboard/models.py
index cf43c30c..86211322 100644
--- a/jet/dashboard/models.py
+++ b/jet/dashboard/models.py
@@ -1,10 +1,16 @@
 from importlib import import_module
 import json
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from jet.utils import LazyDateTimeEncoder
 
+import sys
+
+if sys.version_info.major == 2:
+    from django.utils.encoding import python_2_unicode_compatible
+else:
+    python_2_unicode_compatible = lambda cls: cls
+    
 
 @python_2_unicode_compatible
 class UserDashboardModule(models.Model):
diff --git a/jet/models.py b/jet/models.py
index 8fe97564..ed1390e3 100644
--- a/jet/models.py
+++ b/jet/models.py
@@ -1,9 +1,14 @@
 from django.db import models
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
+import sys
 
+if sys.version_info.major == 2:
+    from django.utils.encoding import python_2_unicode_compatible
+else:
+    python_2_unicode_compatible = lambda cls: cls
 
+    
 @python_2_unicode_compatible
 class Bookmark(models.Model):
     url = models.URLField(verbose_name=_('URL'))
diff --git a/setup.py b/setup.py
index 1cf51df6..09411d59 100644
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,8 @@ def get_install_requires():
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Environment :: Web Environment',
         'Topic :: Software Development',
         'Topic :: Software Development :: User Interfaces',