MrProper
Merge pull request #304 from pbrunet/pep8

MrProper