Merge pull request #1611 from squarewf/patch-1