Add rails 4.1 compatiblility