Chippington Merge pull request #2 from frabert/patch-1