Python 3.6 compatibility

Add compatibility with python 3.6.