Code

\r\n patch from Mathias