Merge branch 'init-rspec'