Added python 3 compatibility