john's superior solution
Merge pull request #72 from goodybag/more-better

john's superior solution