Rspec 3 fixes
Merge pull request #1 from mushishi78/rspec-3-fixes

Rspec 3 fixes