Updated to work with Ruby 1.9.3