Added python 2.7 compatibility