Start working on Python 3 compatibility