Merge pull request #683 from reaperhulk/pep8-naming

More Automated Checks (pep8-naming)