Changes to run on both python 2.7 and 3.2