Added support for rails 4