chris edited some really great code and made everything better for all mankind
Merge pull request #1 from csyversen/master

brendan you should accept this pull request!!