you're killing me
Merge pull request #2 from l3iggs/patch-2