WIP: Feature/rails4