Fixes for Ruby 2.0, tagged v1.0.0