diff --git a/.gitignore b/.gitignore
index 087c883..eb831ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .coverage
 db.sqlite3
 /htmlcov/
+/.tox/
+MANIFEST
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..8402baa
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+Django==1.8.7
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..5f5f247
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,11 @@
+#! /usr/bin/env python
+
+from distutils.core import setup
+
+setup(name='WordChallenge',
+      version='0.1',
+      description='100(ish) word challenge',
+      author='Gergely Polonkai',
+      author_email='gergely@polonkai.eu',
+      url='https://github.com/gergelypolonkai/word-challenge',
+      packages=['wordchallenge', 'words'])
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..3739dcd
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,13 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27,py34
+
+[testenv]
+commands = coverage run manage.py test
+deps =
+     -rrequirements.txt
+     coverage
\ No newline at end of file
diff --git a/words/models.py b/words/models.py
index 9139d53..15f8f54 100644
--- a/words/models.py
+++ b/words/models.py
@@ -2,8 +2,10 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils import timezone
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import get_language
 
+@python_2_unicode_compatible
 class Word(models.Model):
     def translation(self, language):
         try:
@@ -25,6 +27,7 @@ class Word(models.Model):
 
         return ""
 
+@python_2_unicode_compatible
 class WordTranslation(models.Model):
     word = models.ForeignKey(Word, related_name='translations')
     language = models.CharField(max_length=5, db_index=True)
diff --git a/words/tests.py b/words/tests.py
index aac3881..4136094 100644
--- a/words/tests.py
+++ b/words/tests.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8
 from datetime import timedelta
 from django.conf import settings
 from django.contrib.auth.models import User