Made changes for python 3 compatibility