Merge branch 'master' into 'master'

Reverting to python 3.5 for the moment

See merge request !16

setup.py

@@ -97,7 +97,7 @@ setup(
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Python Modules'],
 
     packages=packages,