pep8 and pylint fixes
Merge pull request #1 from kovacsbalu/master

pep8 and pylint fixes