Added support for Rails 4