updated for rails 4.1