Updated to Rails 4.1