PEP8 conformance fixes.
Merge pull request #149 from zas/PEP8_shoot_again

PEP8 conformance fixes.