[#DISCAPP-2: removed extra end of lines, added test, replaces <P> tag for <BR>]