Gabriel Baez

Would be nice if this pull request was accepted, it has some nice changes.

@TheEmpty I forked your repo and when I tried to use it with bundler it gave an error. your changes still work fine, just waned to point the error out....

Would love to see this merged into the core!