updated to Rails 4.1