Updated to work with Rails 4