added Rails 4 support