Modified for Python 3.5