add Rspec specs
Merge with origin