Fix for newer pip versions
Merge pull request #366 from Chive/support/0.7.x

Fix for newer pip versions