diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1ca21ff..fd20ca70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 ## [0.4.6] - 2017-04-13
 ### Changed
 - First open source structure with MIT license and Apache like notice
+- #6: pep 263 - add encoding cookie to .py files
 
 ### Added
 - Basic Documentation
diff --git a/data_migrator/__init__.py b/data_migrator/__init__.py
index 13ad1559..4d0fcca2 100644
--- a/data_migrator/__init__.py
+++ b/data_migrator/__init__.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 VERSION = (0,4,6,'final',0)
 
 PACKAGE_NAME = 'data_migrator'
diff --git a/data_migrator/contrib/__init__.py b/data_migrator/contrib/__init__.py
index f12034e6..d0d36fd5 100644
--- a/data_migrator/contrib/__init__.py
+++ b/data_migrator/contrib/__init__.py
@@ -1,4 +1,7 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 '''
 The data_migrator.contrib contains commonly used helper functions, to support in the setup
 of specific transformations
-''' 
+'''
diff --git a/data_migrator/contrib/dutch.py b/data_migrator/contrib/dutch.py
index ec8607ea..4e668713 100644
--- a/data_migrator/contrib/dutch.py
+++ b/data_migrator/contrib/dutch.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import re
 
 _PHONE_CHARS=re.compile('[^\+\d]+')
diff --git a/data_migrator/contrib/read.py b/data_migrator/contrib/read.py
index 467c7a3b..3139dbc4 100644
--- a/data_migrator/contrib/read.py
+++ b/data_migrator/contrib/read.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import csv
 import sys
 
diff --git a/data_migrator/emitters/__init__.py b/data_migrator/emitters/__init__.py
index 423d045a..8d9fa467 100644
--- a/data_migrator/emitters/__init__.py
+++ b/data_migrator/emitters/__init__.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 from .mysql import MySQLEmitter
 from .csv import CSVEmitter
 
diff --git a/data_migrator/emitters/base.py b/data_migrator/emitters/base.py
index 0760889b..64102f75 100644
--- a/data_migrator/emitters/base.py
+++ b/data_migrator/emitters/base.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 class BaseEmitter(object):
     '''Base for emitters of the data_migrator'''
 
diff --git a/data_migrator/emitters/csv.py b/data_migrator/emitters/csv.py
index e74b7993..954d49a5 100644
--- a/data_migrator/emitters/csv.py
+++ b/data_migrator/emitters/csv.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 from data_migrator.emitters.base import BaseEmitter
 from data_migrator.models.fields import HiddenField
 from data_migrator.utils import default_logger, sql_escape
diff --git a/data_migrator/emitters/mysql.py b/data_migrator/emitters/mysql.py
index 736ce619..b1774231 100644
--- a/data_migrator/emitters/mysql.py
+++ b/data_migrator/emitters/mysql.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 from data_migrator.emitters.base import BaseEmitter
 from data_migrator.models.fields import HiddenField
 from data_migrator.utils import sql_escape, default_logger
diff --git a/data_migrator/exceptions.py b/data_migrator/exceptions.py
index 316f6d2c..85dd5b15 100644
--- a/data_migrator/exceptions.py
+++ b/data_migrator/exceptions.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 class InternalException(Exception):
     """Unexpected internal error"""
     pass
diff --git a/data_migrator/models/__init__.py b/data_migrator/models/__init__.py
index 6e416eb8..0723bb7d 100644
--- a/data_migrator/models/__init__.py
+++ b/data_migrator/models/__init__.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 """
 This module contains all classes for models, managers and fields
 
diff --git a/data_migrator/models/base.py b/data_migrator/models/base.py
index d9d4db1f..abbbea1d 100644
--- a/data_migrator/models/base.py
+++ b/data_migrator/models/base.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 from .manager import SimpleManager
 from .fields import BaseField, HiddenField
 from .options import Options
diff --git a/data_migrator/models/fields.py b/data_migrator/models/fields.py
index b59b62ed..5c720dcd 100644
--- a/data_migrator/models/fields.py
+++ b/data_migrator/models/fields.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import uuid
 import json
 
diff --git a/data_migrator/models/manager.py b/data_migrator/models/manager.py
index d1111ce7..0d53ae20 100644
--- a/data_migrator/models/manager.py
+++ b/data_migrator/models/manager.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 from data_migrator.exceptions import NonUniqueDataException, ValidationException
 from data_migrator.utils import default_logger
 
diff --git a/data_migrator/models/options.py b/data_migrator/models/options.py
index 381da9bc..cf0a687a 100644
--- a/data_migrator/models/options.py
+++ b/data_migrator/models/options.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 from collections import OrderedDict
 
 from data_migrator.exceptions import DefinitionException
diff --git a/data_migrator/transform.py b/data_migrator/transform.py
index d83eb1b7..9de698b3 100644
--- a/data_migrator/transform.py
+++ b/data_migrator/transform.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import sys
 import os
 import logging
diff --git a/data_migrator/utils/__init__.py b/data_migrator/utils/__init__.py
index 21a489c2..eb3e5988 100644
--- a/data_migrator/utils/__init__.py
+++ b/data_migrator/utils/__init__.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 from .sql import sql_escape
 from .reader import default_reader
 from .log import configure_logging, default_logger
diff --git a/data_migrator/utils/argparser.py b/data_migrator/utils/argparser.py
index bf740dcf..d5a1e52f 100644
--- a/data_migrator/utils/argparser.py
+++ b/data_migrator/utils/argparser.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import argparse
 
 _PARSER = None
diff --git a/data_migrator/utils/log.py b/data_migrator/utils/log.py
index 76bfe628..0cc400af 100644
--- a/data_migrator/utils/log.py
+++ b/data_migrator/utils/log.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import logging.config
 
 from data_migrator import PACKAGE_NAME
diff --git a/data_migrator/utils/reader.py b/data_migrator/utils/reader.py
index 2d5a1c47..e3de10cb 100644
--- a/data_migrator/utils/reader.py
+++ b/data_migrator/utils/reader.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import sys
 import csv
 
diff --git a/data_migrator/utils/sql.py b/data_migrator/utils/sql.py
index 14e95158..e5479cd4 100644
--- a/data_migrator/utils/sql.py
+++ b/data_migrator/utils/sql.py
@@ -1,4 +1,5 @@
-
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
 
 def sql_escape(v):
     '''Translate Python native types to SQL relevant strings'''
diff --git a/data_migrator/utils/version.py b/data_migrator/utils/version.py
index 4701d536..3f2cb156 100644
--- a/data_migrator/utils/version.py
+++ b/data_migrator/utils/version.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 # Taken from django, just get a proper version
 
 import datetime
diff --git a/setup.py b/setup.py
index f48ac8b8..58159b58 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 from data_migrator.utils import get_version, get_development_status
 
 from setuptools import setup, find_packages
diff --git a/test/__init__.py b/test/__init__.py
index e69de29b..dcd3642d 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
diff --git a/test/test_contrib.py b/test/test_contrib.py
index ea04a435..74e2edd6 100644
--- a/test/test_contrib.py
+++ b/test/test_contrib.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import unittest
 
 from data_migrator.contrib.dutch import clean_phone
diff --git a/test/test_emitter.py b/test/test_emitter.py
index 75974aa6..4c3a0661 100644
--- a/test/test_emitter.py
+++ b/test/test_emitter.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import unittest
 
 from data_migrator.emitters.base import BaseEmitter
diff --git a/test/test_fields.py b/test/test_fields.py
index 5e8e1d0e..83569492 100644
--- a/test/test_fields.py
+++ b/test/test_fields.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import unittest
 
 from data_migrator import models
diff --git a/test/test_manager.py b/test/test_manager.py
index 2b113e76..1b11fac3 100644
--- a/test/test_manager.py
+++ b/test/test_manager.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import unittest
 
 from data_migrator.models import SimpleManager
diff --git a/test/test_model.py b/test/test_model.py
index 9642aa89..bd5bdb14 100644
--- a/test/test_model.py
+++ b/test/test_model.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import unittest
 
 from data_migrator.models import Model, StringField
diff --git a/test/test_options.py b/test/test_options.py
index 43031c8c..a8180eaa 100644
--- a/test/test_options.py
+++ b/test/test_options.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import unittest
 
 from data_migrator.models.options import Options
diff --git a/test/test_utils.py b/test/test_utils.py
index db7cb1f4..e28ce6b8 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
 import unittest
 
 from data_migrator import utils