Pep 8 fixes.
Merge pull request #130 from dmend/master

PEP-8 fixes.