Adding Rails 4.0 compatability