Merge pull request #4 from ivuk/master

PEP 8 fixes
Merge pull request #5 from ivuk/master

PEP 8 fixes