Python3 compatability.
Correction (?) to Espresso call.
Merge branch 'espresso-fix'