Updated version for Rails 4.1