Merge pull request #1 from kellyegan/master

I thought I already did this?