Make it RSpec 3 compatible
Merge pull request #200 from tubaxenor/rspec-3-compatible

Make it RSpec 3 compatible