Merged changes with milmazz/pep8 branch
Updated tox.ini