Fix
Merge branch 'master' of github.com:gomezhyuuga/sirass_rails