Now works on python2 and python3