Update to support rails 4.0