Rails 4.1 update and modifications
update