Added support for 2.7 and 3