Merge pull request #1158 from angusding/patch-4