Added 2.7 compatibility