Started bringing the code up to date with Ruby 2.