Updated for Rails 4.1