Ruby 2.0 support

Make it work with ruby 2.0. Tests look fine when run with 2.0.