Fixing some PEP-8 issues
Merge pull request #19 from esparta/master

Fixing some PEP-8 issues