Fix setup
Fix specs
Merge branch 'master' of https://github.com/jhnvz/robin_rails