merge in rspec_extensions branch