jimeh Merge pull request #9 from justinbarclay/patch-1