Merge pull request #1330 from gabrownx/patch-1