Works with 3.7
Works better
Progress
Working better
it is working
works
Merged in all the changes to the 3.7 branch