[pep8] pep8 compliant version
Merge pull request #46 from WnP/master

[pep8] pep8 compliant version