Switched to Python 3 - unicode issues also fixed