Added python 2 and 3 compatibility