Feature/rails 4