updated for rails 4 compatibility