PEP8
Merge pull request #8 from yohanboniface/pep8

Merging some PEP8 cleanup