Updates to fix specs
Support for Ruby 2.0.0