Ready for rails 4.1