Working again
Merge branch 'mods'

Fix RSpec
Fix cucumber
Add README.md