Update to work with Ruby 2.0+