Merge pull request #3469 from mfitzp

Fixed pep8 and merged to master locally