Fixes #45, Fixes #49 - More fields from PyPI