Cleaned code with pep8 conventions
Merge pull request #53 from marcwebbie/master

Cleaned code with pep8 conventions