Fixes after merge pep8 errors
Merge pull request #30 from Vegasq/pep8_fixes

Fixes after merge pep8 errors