treshugart Merge pull request #1572 from Jason-Cooke/patch-1