Updated for rails 4.0.1