Merge pull request #637 from matthewreeve/patch-1