Update requirements.pip
Update setup.py
Merge branch 'master' into 19-goto