PR #139 may introduce some PEP8 erros, that we should fix. The goal here is not to fix all PEP8 errors of the package to avoid overwriting a lot the history, but just PEP8 errors from the merge.