Fixing two runtime issues on current version from pip#62

tvogel wants to merge 2 commits intorytilahti:masterrytilahti/python-eq3bt:masterfrom

tvogel:mastertvogel/python-eq3bt:masterCopy head branch name to clipboard