Now works with Rails4