Features/rails4