tested with rails 4.1.4, slight improvements