Added Rails 4 support