updated for rails 4.0.0beta support