merge master brahnch
set up rspec