Added more python3 support