Update for pyinstaller-2.1