try this
scripted update of code from master at 872deaf try this