PEP8
Merge branch 'master' into v2