Refactor
Fix rspec version to work with rspec 4
Bump version