this should be good now
scripted update of code from master at a3cd96e this should be good now