Merge branch 'release/3.0.2' into develop
Update pep8 to version 1.5.0
Update version
erge branch 'release/3.1.0'