merged rspec branch now that tests are passing