diff --git a/README.rst b/README.rst
index 261aaa4..b24c9e7 100644
--- a/README.rst
+++ b/README.rst
@@ -20,7 +20,7 @@ For more information visit `the documentation page
 
 
 Camera Testing : Pytest
--------------
+------------------------
 Install the requirements needed for running pytests:
 
 *pip install -r requirements-test.txt*
diff --git a/emva1288/process/plotting.py b/emva1288/process/plotting.py
index 4c40dd6..fbb2a65 100644
--- a/emva1288/process/plotting.py
+++ b/emva1288/process/plotting.py
@@ -9,7 +9,6 @@
 
 """
 
-from __future__ import print_function
 import numpy as np
 
 from . import routines
diff --git a/emva1288/process/results.py b/emva1288/process/results.py
index addda60..34ef536 100644
--- a/emva1288/process/results.py
+++ b/emva1288/process/results.py
@@ -8,7 +8,6 @@
 values.
 """
 
-from __future__ import print_function
 import logging
 import numpy as np
 from emva1288.process import routines
diff --git a/emva1288/process/routines.py b/emva1288/process/routines.py
index ccf6f77..8a09c1c 100644
--- a/emva1288/process/routines.py
+++ b/emva1288/process/routines.py
@@ -6,7 +6,6 @@
 """Utils functions
 
 """
-from __future__ import print_function
 import numpy as np
 import os
 from scipy.optimize import leastsq
@@ -21,6 +20,7 @@
 
 SIGNIFICANT_DIGITS = 7
 
+
 def load_image(fname):
     img = Image.open(fname)
     img = np.asarray(img.split()[0])
diff --git a/examples/emva_xml_compare.py b/examples/emva_xml_compare.py
index 2c7dda7..61e4a96 100644
--- a/examples/emva_xml_compare.py
+++ b/examples/emva_xml_compare.py
@@ -8,5 +8,6 @@
 fcompare = 'EMVA1288_Compare.txt'
 
 u = process.routines.compare_xml(os.path.join(dir_, fresult1),
-                                 os.path.join(dir_, fresult2), os.path.join(dir_, fcompare))
+                                 os.path.join(dir_, fresult2),
+                                 os.path.join(dir_, fcompare))
 print(u)
diff --git a/setup.cfg b/setup.cfg
index 2a9acf1..361b0a6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [bdist_wheel]
-universal = 1
+
diff --git a/setup.py b/setup.py
index 362b360..9f4a913 100644
--- a/setup.py
+++ b/setup.py
@@ -34,14 +34,13 @@
       version=__version__,
       description='EMVA1288 reference implementation',
       long_description=long_description,
+      long_description_content_type='text/x-rst',
       author='Federico Ariza',
       author_email='ariza.federico@gmail.com',
       url='https://github.com/EMVA1288/emva1288',
       keywords=['sensors', 'cameras'],
-      classifiers=['Programming Language :: Python :: 2',
-                   'Programming Language :: Python :: 2.7',
-                   'Programming Language :: Python :: 3',
-                   'Programming Language :: Python :: 3.4'],
+      classifiers=['Programming Language :: Python :: 3',
+                   'Programming Language :: Python :: 3.6'],
       install_requires=install_requires,
       extras_require={'doc': extra_doc},
       package_data={'emva1288': ['report/files/*', 'report/templates/*',