I feel better about this
Merge pull request #2 from reminy/master

I feel better about this