Added support for Python 3.6