Updated to be compatible with Rails 4.1