Updated up to rails 3.2 compatibility