Merge pull request #1142 from angusding/patch-2