Porting to Python 3
Merge branch 'Python3Conversion'