Updated to Rails 4