steventroughtonsmith Merge pull request #7 from 916253/patch-1