Huan

@DanielRuf my changes essentially tried to get the code to a place that it's now already in with the Python 3 script + your merged changes. Thanks for your work.