Add Py3k support