Merge pull request #1031 from ahomatthew/develop

Updates