Make previous commit compatible with py33 and py34