Made changes for python 2.6 and 3+