Enhance: Support python 3