update for rails 4.0