Minor additions, see belowPyPI compatible