Merge pull request #1085 from stevewithington/develop

update for issue #1083