Development

I made two minor updates that should be included in the released version. Rob, please feel free to merge the branches and include this master version for your next Workbench bundle.