Merge pull request #1459 from brianjmurrell/patch-1