willscott Merge pull request #7 from alexflint/patch-1