Updated the code for Ruby 1.8.7 compatibility