updated for Rails 4.0.2