Get working against Ruby 2.0
Get working under Ruby 1.9