Merge pull request #1234 from brada4/develop