Merge pull request #1 from noisy/bug_1889

Adjustments to pep8