Added back python 2.x compatbility