Merging our kathi branch into your develop branch

Hi Richard,
Here is the pull request you asked me for, I hope I'm doing this right. This inteds to ask you to pull my changes (BlueFern/kathi) into your develop branch (rgbrown/develop). 
Cheers, Kathi