Merge pull request #1 from GaryJones/develop

Updates from Gary