some more goodness
scripted update of code from master at 24d524b some more goodness