New Pull request, discharge old one: Merging Bluefern kathi branch into rgbrown's develop branch

Hi Richard,
Us again :) Kon helped me with the merging and pull-requesting - here goes a new pull request that should be in the right format now. Please discharge the old one and review my changes.
Thank you very much, Kathi