I believe this, along with an update to toolshed fixes #6 and #7. @superbobry ?