Added support for carriage returns