Rspec 3

rebase with current master :)