Update for RSpec-3
Merge branch 'rspec3'
Version 1.0.0