@mitsuhiko, i am taking you at your word

http://www.bpaste.net/show/SG19eDNgMQcXTHhDMS0r/
Merge pull request #323 from untitaker/sprint-branch

@mitsuhiko, i am taking you at your word