Added support for Ruby 2.0.x

(see commit messages)