troygoode Merge pull request #24 from BenSower/patch-1