Merge pull request #1235 from stevewithington/develop

bug fix: issue #1234 comments  
Thanks Steve!