Merge pull request #1164 from angusding/patch-5