Merge pull request #46 from connormontgomery/patch-1