Compatibility updates

This version runs with Ruby 2.
Manual merge