Added linebreak option and supporting tests