Changes to support python 2 and 3 at the same time