Indentation and spacing fixes, according to PEP8
Merge pull request #193 from zas/pep8

Indentation and spacing fixes, according to PEP8, only cosmetic changes.