Making 'pip install' happier
Update version to match our release version
Merge branch 'hotfix/cleanup'