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