Changed to Ruby 2 and Rails 4