Feature/rails compatability