Feature/rails4