Fixed PEP8 and syntax issues
Merge pull request #5 from sontek/fix_pep8_syntax

Fixed PEP8 and syntax issues