updated to work with rails 3.2.12