Added support for \r in cells