updated for Rails 4.1