Added support for rails 4.1