Updated to work with ruby-2.0.0-p247