fix pip install
Merge branch 'master' into flake8