andyphilips Merge pull request #8 from kthyng/patch-1