added CRLF + modified javadoc