ashb Merge pull request #312 from ben-turner/patch-1