This now works with python 2 and 3