Fix pep8
Update version
Merge branch 'release/3.1.1' into develop