Merge pull request #1529 from jamtur01/patch-1