Patch 1

This represents C. Price's updates, forked by D. Ignizio back into the source development space (as a separate branch). This pull request should enable a merge of these edits back into the Source branch...