PEP8

See #83
Merge pull request #86 from Liblor/development

PEP8
Fixes #86