Updated to support Rails 4.0.0 final