supports rspec 3 while keeping compatibility with 2.2
merge conflicts