updated for rails 3.2 support