timnovinger Merge pull request #2 from jlbooth/patch-1