Fix setup.py
Update README.md
Update README.md
Merge branch 'master' into dev
Update PyInstaller hook and version numbers
Update README.md