Adding python 3 compatibility
Merge branch 'python_3_support'